diff options
Diffstat (limited to 'intern/ghost/intern/GHOST_System.h')
| -rw-r--r-- | intern/ghost/intern/GHOST_System.h | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/intern/ghost/intern/GHOST_System.h b/intern/ghost/intern/GHOST_System.h index 2eec6ca43b3..c2d712c11cd 100644 --- a/intern/ghost/intern/GHOST_System.h +++ b/intern/ghost/intern/GHOST_System.h @@ -31,9 +31,9 @@ #include "GHOST_Debug.h" #include "GHOST_EventManager.h" #include "GHOST_ModifierKeys.h" -#ifdef GHOST_DEBUG +#ifdef WITH_GHOST_DEBUG # include "GHOST_EventPrinter.h" -#endif // GHOST_DEBUG +#endif // WITH_GHOST_DEBUG class GHOST_DisplayManager; class GHOST_Event; @@ -119,12 +119,6 @@ class GHOST_System : public GHOST_ISystem { virtual GHOST_IContext *createOffscreenContext() = 0; /** - * Overload to allow requesting a different context type. By default only OpenGL is supported. - * However by explicitly overloading this a system may add support for others. - */ - GHOST_IContext *createOffscreenContext(GHOST_TDrawingContextType type); - - /** * Returns whether a window is valid. * \param window Pointer to the window to be checked. * \return Indication of validity. @@ -225,7 +219,7 @@ class GHOST_System : public GHOST_ISystem { ***************************************************************************************/ /** - * Returns the state of a modifier key (ouside the message queue). + * Returns the state of a modifier key (outside the message queue). * \param mask The modifier key state to retrieve. * \param isDown The state of a modifier key (true == pressed). * \return Indication of success. @@ -233,7 +227,7 @@ class GHOST_System : public GHOST_ISystem { GHOST_TSuccess getModifierKeyState(GHOST_TModifierKeyMask mask, bool &isDown) const; /** - * Returns the state of a mouse button (ouside the message queue). + * Returns the state of a mouse button (outside the message queue). * \param mask The button state to retrieve. * \param isDown Button state. * \return Indication of success. @@ -253,8 +247,8 @@ class GHOST_System : public GHOST_ISystem { ***************************************************************************************/ /** - * Sets 3D mouse deadzone - * \param deadzone: Deadzone of the 3D mouse (both for rotation and pan) relative to full range + * Sets 3D mouse dead-zone + * \param deadzone: Dead-zone of the 3D mouse (both for rotation and pan) relative to full range. */ void setNDOFDeadZone(float deadzone); #endif @@ -301,7 +295,7 @@ class GHOST_System : public GHOST_ISystem { virtual GHOST_TSuccess getModifierKeys(GHOST_ModifierKeys &keys) const = 0; /** - * Returns the state of the mouse buttons (ouside the message queue). + * Returns the state of the mouse buttons (outside the message queue). * \param buttons The state of the buttons. * \return Indication of success. */ @@ -396,9 +390,9 @@ class GHOST_System : public GHOST_ISystem { #endif /** Prints all the events. */ -#ifdef GHOST_DEBUG +#ifdef WITH_GHOST_DEBUG GHOST_EventPrinter *m_eventPrinter; -#endif // GHOST_DEBUG +#endif // WITH_GHOST_DEBUG /** Settings of the display before the display went fullscreen. */ GHOST_DisplaySetting m_preFullScreenSetting; |