forked from bartvdbraak/blender
Cleanup: use bool for GHOST_SystemWin32::setConsoleWindowState return
This commit is contained in:
parent
0f8ebd21e3
commit
c4a16389bc
@ -437,9 +437,9 @@ class GHOST_ISystem {
|
||||
/**
|
||||
* Set the Console State
|
||||
* \param action: console state
|
||||
* \return current status (1 -visible, 0 - hidden)
|
||||
* \return current status (true: visible, 0: hidden)
|
||||
*/
|
||||
virtual int setConsoleWindowState(GHOST_TConsoleWindowState action) = 0;
|
||||
virtual bool setConsoleWindowState(GHOST_TConsoleWindowState action) = 0;
|
||||
|
||||
/***************************************************************************************
|
||||
* Access to clipboard.
|
||||
|
@ -869,8 +869,7 @@ void GHOST_putClipboard(const char *buffer, bool selection)
|
||||
bool GHOST_setConsoleWindowState(GHOST_TConsoleWindowState action)
|
||||
{
|
||||
GHOST_ISystem *system = GHOST_ISystem::getSystem();
|
||||
/* FIXME: use `bool` instead of int for this value. */
|
||||
return (bool)system->setConsoleWindowState(action);
|
||||
return system->setConsoleWindowState(action);
|
||||
}
|
||||
|
||||
bool GHOST_UseNativePixels(void)
|
||||
|
@ -236,9 +236,9 @@ class GHOST_SystemCocoa : public GHOST_System {
|
||||
/**
|
||||
* \see GHOST_ISystem
|
||||
*/
|
||||
int setConsoleWindowState(GHOST_TConsoleWindowState action)
|
||||
bool setConsoleWindowState(GHOST_TConsoleWindowState action)
|
||||
{
|
||||
return 0;
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -30,7 +30,7 @@ class GHOST_SystemHeadless : public GHOST_System {
|
||||
{
|
||||
return false;
|
||||
}
|
||||
int setConsoleWindowState(GHOST_TConsoleWindowState /*action*/) override
|
||||
bool setConsoleWindowState(GHOST_TConsoleWindowState /*action*/) override
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
@ -33,9 +33,9 @@ class GHOST_SystemSDL : public GHOST_System {
|
||||
|
||||
bool processEvents(bool waitForEvent);
|
||||
|
||||
int setConsoleWindowState(GHOST_TConsoleWindowState /*action*/)
|
||||
bool setConsoleWindowState(GHOST_TConsoleWindowState /*action*/)
|
||||
{
|
||||
return 0;
|
||||
return false;
|
||||
}
|
||||
|
||||
GHOST_TSuccess getModifierKeys(GHOST_ModifierKeys &keys) const;
|
||||
|
@ -3035,9 +3035,9 @@ bool GHOST_SystemWayland::processEvents(bool waitForEvent)
|
||||
return any_processed;
|
||||
}
|
||||
|
||||
int GHOST_SystemWayland::setConsoleWindowState(GHOST_TConsoleWindowState /*action*/)
|
||||
bool GHOST_SystemWayland::setConsoleWindowState(GHOST_TConsoleWindowState /*action*/)
|
||||
{
|
||||
return 0;
|
||||
return false;
|
||||
}
|
||||
|
||||
GHOST_TSuccess GHOST_SystemWayland::getModifierKeys(GHOST_ModifierKeys &keys) const
|
||||
|
@ -97,7 +97,7 @@ class GHOST_SystemWayland : public GHOST_System {
|
||||
|
||||
bool processEvents(bool waitForEvent) override;
|
||||
|
||||
int setConsoleWindowState(GHOST_TConsoleWindowState action) override;
|
||||
bool setConsoleWindowState(GHOST_TConsoleWindowState action) override;
|
||||
|
||||
GHOST_TSuccess getModifierKeys(GHOST_ModifierKeys &keys) const override;
|
||||
|
||||
|
@ -131,7 +131,7 @@ GHOST_SystemWin32::GHOST_SystemWin32()
|
||||
GHOST_ASSERT(m_displayManager, "GHOST_SystemWin32::GHOST_SystemWin32(): m_displayManager==0\n");
|
||||
m_displayManager->initialize();
|
||||
|
||||
m_consoleStatus = 1;
|
||||
m_consoleStatus = true;
|
||||
|
||||
/* Tell Windows we are per monitor DPI aware. This disables the default
|
||||
* blurry scaling and enables WM_DPICHANGED to allow us to draw at proper DPI. */
|
||||
@ -2320,7 +2320,7 @@ static bool isStartedFromCommandPrompt()
|
||||
return false;
|
||||
}
|
||||
|
||||
int GHOST_SystemWin32::setConsoleWindowState(GHOST_TConsoleWindowState action)
|
||||
bool GHOST_SystemWin32::setConsoleWindowState(GHOST_TConsoleWindowState action)
|
||||
{
|
||||
HWND wnd = GetConsoleWindow();
|
||||
|
||||
@ -2328,13 +2328,13 @@ int GHOST_SystemWin32::setConsoleWindowState(GHOST_TConsoleWindowState action)
|
||||
case GHOST_kConsoleWindowStateHideForNonConsoleLaunch: {
|
||||
if (!isStartedFromCommandPrompt()) {
|
||||
ShowWindow(wnd, SW_HIDE);
|
||||
m_consoleStatus = 0;
|
||||
m_consoleStatus = false;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case GHOST_kConsoleWindowStateHide: {
|
||||
ShowWindow(wnd, SW_HIDE);
|
||||
m_consoleStatus = 0;
|
||||
m_consoleStatus = false;
|
||||
break;
|
||||
}
|
||||
case GHOST_kConsoleWindowStateShow: {
|
||||
@ -2342,7 +2342,7 @@ int GHOST_SystemWin32::setConsoleWindowState(GHOST_TConsoleWindowState action)
|
||||
if (!isStartedFromCommandPrompt()) {
|
||||
DeleteMenu(GetSystemMenu(wnd, FALSE), SC_CLOSE, MF_BYCOMMAND);
|
||||
}
|
||||
m_consoleStatus = 1;
|
||||
m_consoleStatus = true;
|
||||
break;
|
||||
}
|
||||
case GHOST_kConsoleWindowStateToggle: {
|
||||
|
@ -430,7 +430,7 @@ class GHOST_SystemWin32 : public GHOST_System {
|
||||
* \param action: console state
|
||||
* \return current status (1 -visible, 0 - hidden)
|
||||
*/
|
||||
int setConsoleWindowState(GHOST_TConsoleWindowState action);
|
||||
bool setConsoleWindowState(GHOST_TConsoleWindowState action);
|
||||
|
||||
/** The virtual-key code (VKey) of the last press event. Used to detect repeat events. */
|
||||
unsigned short m_keycode_last_repeat_key;
|
||||
@ -450,7 +450,7 @@ class GHOST_SystemWin32 : public GHOST_System {
|
||||
HKL m_keylayout;
|
||||
|
||||
/** Console status. */
|
||||
int m_consoleStatus;
|
||||
bool m_consoleStatus;
|
||||
|
||||
/** Wheel delta accumulator. */
|
||||
int m_wheelDeltaAccum;
|
||||
|
@ -253,7 +253,7 @@ class GHOST_SystemX11 : public GHOST_System {
|
||||
/**
|
||||
* \see GHOST_ISystem
|
||||
*/
|
||||
int setConsoleWindowState(GHOST_TConsoleWindowState /*action*/)
|
||||
bool setConsoleWindowState(GHOST_TConsoleWindowState /*action*/)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user