diff options
Diffstat (limited to 'intern/ghost')
31 files changed, 265 insertions, 265 deletions
diff --git a/intern/ghost/intern/GHOST_Buttons.h b/intern/ghost/intern/GHOST_Buttons.h index 6b0d74e7eb9..0aa93a2fad0 100644 --- a/intern/ghost/intern/GHOST_Buttons.h +++ b/intern/ghost/intern/GHOST_Buttons.h @@ -48,26 +48,26 @@ struct GHOST_Buttons { */ GHOST_Buttons(); - virtual ~GHOST_Buttons(); + ~GHOST_Buttons(); /** * Returns the state of a single button. * \param mask Key button to return. * \return The state of the button (pressed == true). */ - virtual bool get(GHOST_TButtonMask mask) const; + bool get(GHOST_TButtonMask mask) const; /** * Updates the state of a single button. * \param mask Button state to update. * \param down The new state of the button. */ - virtual void set(GHOST_TButtonMask mask, bool down); + void set(GHOST_TButtonMask mask, bool down); /** * Sets the state of all buttons to up. */ - virtual void clear(); + void clear(); GHOST_TUns8 m_ButtonLeft : 1; GHOST_TUns8 m_ButtonMiddle : 1; diff --git a/intern/ghost/intern/GHOST_CallbackEventConsumer.h b/intern/ghost/intern/GHOST_CallbackEventConsumer.h index 770ebdc8b78..3505d651fa3 100644 --- a/intern/ghost/intern/GHOST_CallbackEventConsumer.h +++ b/intern/ghost/intern/GHOST_CallbackEventConsumer.h @@ -57,7 +57,7 @@ public: /** * Destructor. */ - virtual ~GHOST_CallbackEventConsumer(void) + ~GHOST_CallbackEventConsumer(void) { } @@ -66,7 +66,7 @@ public: * \param event The event that can be handled or ignored. * \return Indication as to whether the event was handled. */ - virtual bool processEvent(GHOST_IEvent *event); + bool processEvent(GHOST_IEvent *event); protected: /** The call-back routine invoked. */ diff --git a/intern/ghost/intern/GHOST_ContextCGL.h b/intern/ghost/intern/GHOST_ContextCGL.h index 99d995bcbb1..8619a130035 100644 --- a/intern/ghost/intern/GHOST_ContextCGL.h +++ b/intern/ghost/intern/GHOST_ContextCGL.h @@ -72,53 +72,53 @@ public: /** * Destructor. */ - virtual ~GHOST_ContextCGL(); + ~GHOST_ContextCGL(); /** * Swaps front and back buffers of a window. * \return A boolean success indicator. */ - virtual GHOST_TSuccess swapBuffers(); + GHOST_TSuccess swapBuffers(); /** * Activates the drawing context of this window. * \return A boolean success indicator. */ - virtual GHOST_TSuccess activateDrawingContext(); + GHOST_TSuccess activateDrawingContext(); /** * Call immediately after new to initialize. If this fails then immediately delete the object. * \return Indication as to whether initialization has succeeded. */ - virtual GHOST_TSuccess initializeDrawingContext(); + GHOST_TSuccess initializeDrawingContext(); /** * Removes references to native handles from this context and then returns * \return GHOST_kSuccess if it is OK for the parent to release the handles and * GHOST_kFailure if releasing the handles will interfere with sharing */ - virtual GHOST_TSuccess releaseNativeHandles(); + GHOST_TSuccess releaseNativeHandles(); /** * Sets the swap interval for swapBuffers. * \param interval The swap interval to use. * \return A boolean success indicator. */ - virtual GHOST_TSuccess setSwapInterval(int interval); + GHOST_TSuccess setSwapInterval(int interval); /** * Gets the current swap interval for swapBuffers. * \param intervalOut Variable to store the swap interval if it can be read. * \return Whether the swap interval can be read. */ - virtual GHOST_TSuccess getSwapInterval(int&); + GHOST_TSuccess getSwapInterval(int&); /** * Updates the drawing context of this window. * Needed whenever the window is changed. * \return Indication of success. */ - virtual GHOST_TSuccess updateDrawingContext(); + GHOST_TSuccess updateDrawingContext(); //protected: // inline void activateCGLEW() const { diff --git a/intern/ghost/intern/GHOST_ContextEGL.h b/intern/ghost/intern/GHOST_ContextEGL.h index 5e458139ade..70c26c940fc 100644 --- a/intern/ghost/intern/GHOST_ContextEGL.h +++ b/intern/ghost/intern/GHOST_ContextEGL.h @@ -75,39 +75,39 @@ public: /** * Destructor. */ - virtual ~GHOST_ContextEGL(); + ~GHOST_ContextEGL(); /** * Swaps front and back buffers of a window. * \return A boolean success indicator. */ - virtual GHOST_TSuccess swapBuffers(); + GHOST_TSuccess swapBuffers(); /** * Activates the drawing context of this window. * \return A boolean success indicator. */ - virtual GHOST_TSuccess activateDrawingContext(); + GHOST_TSuccess activateDrawingContext(); /** * Call immediately after new to initialize. If this fails then immediately delete the object. * \return Indication as to whether initialization has succeeded. */ - virtual GHOST_TSuccess initializeDrawingContext(); + GHOST_TSuccess initializeDrawingContext(); /** * Removes references to native handles from this context and then returns * \return GHOST_kSuccess if it is OK for the parent to release the handles and * GHOST_kFailure if releasing the handles will interfere with sharing */ - virtual GHOST_TSuccess releaseNativeHandles(); + GHOST_TSuccess releaseNativeHandles(); /** * Sets the swap interval for swapBuffers. * \param interval The swap interval to use. * \return A boolean success indicator. */ - virtual GHOST_TSuccess setSwapInterval(int interval); + GHOST_TSuccess setSwapInterval(int interval); /** * Gets the current swap interval for swapBuffers. diff --git a/intern/ghost/intern/GHOST_ContextGLX.h b/intern/ghost/intern/GHOST_ContextGLX.h index 9bc17d476fb..e2169ac6adb 100644 --- a/intern/ghost/intern/GHOST_ContextGLX.h +++ b/intern/ghost/intern/GHOST_ContextGLX.h @@ -75,46 +75,46 @@ public: /** * Destructor. */ - virtual ~GHOST_ContextGLX(); + ~GHOST_ContextGLX(); /** * Swaps front and back buffers of a window. * \return A boolean success indicator. */ - virtual GHOST_TSuccess swapBuffers(); + GHOST_TSuccess swapBuffers(); /** * Activates the drawing context of this window. * \return A boolean success indicator. */ - virtual GHOST_TSuccess activateDrawingContext(); + GHOST_TSuccess activateDrawingContext(); /** * Call immediately after new to initialize. If this fails then immediately delete the object. * \return Indication as to whether initialization has succeeded. */ - virtual GHOST_TSuccess initializeDrawingContext(); + GHOST_TSuccess initializeDrawingContext(); /** * Removes references to native handles from this context and then returns * \return GHOST_kSuccess if it is OK for the parent to release the handles and * GHOST_kFailure if releasing the handles will interfere with sharing */ - virtual GHOST_TSuccess releaseNativeHandles(); + GHOST_TSuccess releaseNativeHandles(); /** * Sets the swap interval for swapBuffers. * \param interval The swap interval to use. * \return A boolean success indicator. */ - virtual GHOST_TSuccess setSwapInterval(int interval); + GHOST_TSuccess setSwapInterval(int interval); /** * Gets the current swap interval for swapBuffers. * \param intervalOut Variable to store the swap interval if it can be read. * \return Whether the swap interval can be read. */ - virtual GHOST_TSuccess getSwapInterval(int &intervalOut); + GHOST_TSuccess getSwapInterval(int &intervalOut); protected: inline void activateGLXEW() const { diff --git a/intern/ghost/intern/GHOST_ContextNone.h b/intern/ghost/intern/GHOST_ContextNone.h index c36873c039f..80cce76190d 100644 --- a/intern/ghost/intern/GHOST_ContextNone.h +++ b/intern/ghost/intern/GHOST_ContextNone.h @@ -51,44 +51,44 @@ public: * Dummy function * \return Always succeeds */ - virtual GHOST_TSuccess swapBuffers(); + GHOST_TSuccess swapBuffers(); /** * Dummy function * \return Always succeeds */ - virtual GHOST_TSuccess activateDrawingContext(); + GHOST_TSuccess activateDrawingContext(); /** * Dummy function * \return Always succeeds */ - virtual GHOST_TSuccess updateDrawingContext(); + GHOST_TSuccess updateDrawingContext(); /** * Dummy function * \return Always succeeds */ - virtual GHOST_TSuccess initializeDrawingContext(); + GHOST_TSuccess initializeDrawingContext(); /** * Dummy function * \return Always succeeds */ - virtual GHOST_TSuccess releaseNativeHandles(); + GHOST_TSuccess releaseNativeHandles(); /** * Dummy function * \return Always succeeds */ - virtual GHOST_TSuccess setSwapInterval(int interval); + GHOST_TSuccess setSwapInterval(int interval); /** * Dummy function * \param intervalOut Gets whatever was set by setSwapInterval * \return Always succeeds */ - virtual GHOST_TSuccess getSwapInterval(int &intervalOut); + GHOST_TSuccess getSwapInterval(int &intervalOut); private: int m_swapInterval; diff --git a/intern/ghost/intern/GHOST_ContextSDL.h b/intern/ghost/intern/GHOST_ContextSDL.h index 5edf1a0aee8..c151d8e9f9d 100644 --- a/intern/ghost/intern/GHOST_ContextSDL.h +++ b/intern/ghost/intern/GHOST_ContextSDL.h @@ -67,46 +67,46 @@ public: /** * Destructor. */ - virtual ~GHOST_ContextSDL(); + ~GHOST_ContextSDL(); /** * Swaps front and back buffers of a window. * \return A boolean success indicator. */ - virtual GHOST_TSuccess swapBuffers(); + GHOST_TSuccess swapBuffers(); /** * Activates the drawing context of this window. * \return A boolean success indicator. */ - virtual GHOST_TSuccess activateDrawingContext(); + GHOST_TSuccess activateDrawingContext(); /** * Call immediately after new to initialize. If this fails then immediately delete the object. * \return Indication as to whether initialization has succeeded. */ - virtual GHOST_TSuccess initializeDrawingContext(); + GHOST_TSuccess initializeDrawingContext(); /** * Removes references to native handles from this context and then returns * \return GHOST_kSuccess if it is OK for the parent to release the handles and * GHOST_kFailure if releasing the handles will interfere with sharing */ - virtual GHOST_TSuccess releaseNativeHandles(); + GHOST_TSuccess releaseNativeHandles(); /** * Sets the swap interval for swapBuffers. * \param interval The swap interval to use. * \return A boolean success indicator. */ - virtual GHOST_TSuccess setSwapInterval(int interval); + GHOST_TSuccess setSwapInterval(int interval); /** * Gets the current swap interval for swapBuffers. * \param intervalOut Variable to store the swap interval if it can be read. * \return Whether the swap interval can be read. */ - virtual GHOST_TSuccess getSwapInterval(int &intervalOut); + GHOST_TSuccess getSwapInterval(int &intervalOut); private: SDL_Window *m_window; diff --git a/intern/ghost/intern/GHOST_ContextWGL.h b/intern/ghost/intern/GHOST_ContextWGL.h index f2a5171c579..189121d7d5d 100644 --- a/intern/ghost/intern/GHOST_ContextWGL.h +++ b/intern/ghost/intern/GHOST_ContextWGL.h @@ -73,46 +73,46 @@ public: /** * Destructor. */ - virtual ~GHOST_ContextWGL(); + ~GHOST_ContextWGL(); /** * Swaps front and back buffers of a window. * \return A boolean success indicator. */ - virtual GHOST_TSuccess swapBuffers(); + GHOST_TSuccess swapBuffers(); /** * Activates the drawing context of this window. * \return A boolean success indicator. */ - virtual GHOST_TSuccess activateDrawingContext(); + GHOST_TSuccess activateDrawingContext(); /** * Call immediately after new to initialize. If this fails then immediately delete the object. * \return Indication as to whether initialization has succeeded. */ - virtual GHOST_TSuccess initializeDrawingContext(); + GHOST_TSuccess initializeDrawingContext(); /** * Removes references to native handles from this context and then returns * \return GHOST_kSuccess if it is OK for the parent to release the handles and * GHOST_kFailure if releasing the handles will interfere with sharing */ - virtual GHOST_TSuccess releaseNativeHandles(); + GHOST_TSuccess releaseNativeHandles(); /** * Sets the swap interval for swapBuffers. * \param interval The swap interval to use. * \return A boolean success indicator. */ - virtual GHOST_TSuccess setSwapInterval(int interval); + GHOST_TSuccess setSwapInterval(int interval); /** * Gets the current swap interval for swapBuffers. * \param intervalOut Variable to store the swap interval if it can be read. * \return Whether the swap interval can be read. */ - virtual GHOST_TSuccess getSwapInterval(int &intervalOut); + GHOST_TSuccess getSwapInterval(int &intervalOut); protected: inline void activateWGLEW() const { diff --git a/intern/ghost/intern/GHOST_DisplayManagerCocoa.h b/intern/ghost/intern/GHOST_DisplayManagerCocoa.h index 1f17b4dd976..bfed2e0d37e 100644 --- a/intern/ghost/intern/GHOST_DisplayManagerCocoa.h +++ b/intern/ghost/intern/GHOST_DisplayManagerCocoa.h @@ -58,7 +58,7 @@ public: * \param numDisplays The number of displays on this system. * \return Indication of success. */ - virtual GHOST_TSuccess getNumDisplays(GHOST_TUns8& numDisplays) const; + GHOST_TSuccess getNumDisplays(GHOST_TUns8& numDisplays) const; /** * Returns the number of display settings for this display device. @@ -66,7 +66,7 @@ public: * \param setting The number of settings of the display device with this index. * \return Indication of success. */ - virtual GHOST_TSuccess getNumDisplaySettings(GHOST_TUns8 display, GHOST_TInt32& numSettings) const; + GHOST_TSuccess getNumDisplaySettings(GHOST_TUns8 display, GHOST_TInt32& numSettings) const; /** * Returns the current setting for this display device. @@ -75,7 +75,7 @@ public: * \param setting The setting of the display device with this index. * \return Indication of success. */ - virtual GHOST_TSuccess getDisplaySetting(GHOST_TUns8 display, GHOST_TInt32 index, GHOST_DisplaySetting& setting) const; + GHOST_TSuccess getDisplaySetting(GHOST_TUns8 display, GHOST_TInt32 index, GHOST_DisplaySetting& setting) const; /** * Returns the current setting for this display device. @@ -83,7 +83,7 @@ public: * \param setting The current setting of the display device with this index. * \return Indication of success. */ - virtual GHOST_TSuccess getCurrentDisplaySetting(GHOST_TUns8 display, GHOST_DisplaySetting& setting) const; + GHOST_TSuccess getCurrentDisplaySetting(GHOST_TUns8 display, GHOST_DisplaySetting& setting) const; /** * Changes the current setting for this display device. @@ -91,7 +91,7 @@ public: * \param setting The current setting of the display device with this index. * \return Indication of success. */ - virtual GHOST_TSuccess setCurrentDisplaySetting(GHOST_TUns8 display, const GHOST_DisplaySetting& setting); + GHOST_TSuccess setCurrentDisplaySetting(GHOST_TUns8 display, const GHOST_DisplaySetting& setting); protected: //Do not cache values as OS X supports screen hot plug diff --git a/intern/ghost/intern/GHOST_DisplayManagerWin32.h b/intern/ghost/intern/GHOST_DisplayManagerWin32.h index ced4ceac044..801ad29f45a 100644 --- a/intern/ghost/intern/GHOST_DisplayManagerWin32.h +++ b/intern/ghost/intern/GHOST_DisplayManagerWin32.h @@ -58,7 +58,7 @@ public: * \param numDisplays The number of displays on this system. * \return Indication of success. */ - virtual GHOST_TSuccess getNumDisplays(GHOST_TUns8& numDisplays) const; + GHOST_TSuccess getNumDisplays(GHOST_TUns8& numDisplays) const; /** * Returns the number of display settings for this display device. @@ -66,7 +66,7 @@ public: * \param setting The number of settings of the display device with this index. * \return Indication of success. */ - virtual GHOST_TSuccess getNumDisplaySettings(GHOST_TUns8 display, GHOST_TInt32& numSettings) const; + GHOST_TSuccess getNumDisplaySettings(GHOST_TUns8 display, GHOST_TInt32& numSettings) const; /** * Returns the current setting for this display device. @@ -75,7 +75,7 @@ public: * \param setting The setting of the display device with this index. * \return Indication of success. */ - virtual GHOST_TSuccess getDisplaySetting(GHOST_TUns8 display, GHOST_TInt32 index, GHOST_DisplaySetting& setting) const; + GHOST_TSuccess getDisplaySetting(GHOST_TUns8 display, GHOST_TInt32 index, GHOST_DisplaySetting& setting) const; /** * Returns the current setting for this display device. @@ -83,7 +83,7 @@ public: * \param setting The current setting of the display device with this index. * \return Indication of success. */ - virtual GHOST_TSuccess getCurrentDisplaySetting(GHOST_TUns8 display, GHOST_DisplaySetting& setting) const; + GHOST_TSuccess getCurrentDisplaySetting(GHOST_TUns8 display, GHOST_DisplaySetting& setting) const; /** * Changes the current setting for this display device. @@ -91,7 +91,7 @@ public: * \param setting The current setting of the display device with this index. * \return Indication of success. */ - virtual GHOST_TSuccess setCurrentDisplaySetting(GHOST_TUns8 display, const GHOST_DisplaySetting& setting); + GHOST_TSuccess setCurrentDisplaySetting(GHOST_TUns8 display, const GHOST_DisplaySetting& setting); protected: }; diff --git a/intern/ghost/intern/GHOST_DropTargetWin32.h b/intern/ghost/intern/GHOST_DropTargetWin32.h index fb85feffde0..56bae1fd1b2 100644 --- a/intern/ghost/intern/GHOST_DropTargetWin32.h +++ b/intern/ghost/intern/GHOST_DropTargetWin32.h @@ -89,7 +89,7 @@ public: * Destructor * Do NOT destroy directly. Use Release() instead to make COM happy. */ - virtual ~GHOST_DropTargetWin32(); + ~GHOST_DropTargetWin32(); private: diff --git a/intern/ghost/intern/GHOST_Event.h b/intern/ghost/intern/GHOST_Event.h index ea4d603be83..6a715498b87 100644 --- a/intern/ghost/intern/GHOST_Event.h +++ b/intern/ghost/intern/GHOST_Event.h @@ -59,7 +59,7 @@ public: * Returns the event type. * \return The event type. */ - virtual GHOST_TEventType getType() + GHOST_TEventType getType() { return m_type; } @@ -68,7 +68,7 @@ public: * Returns the time this event was generated. * \return The event generation time. */ - virtual GHOST_TUns64 getTime() + GHOST_TUns64 getTime() { return m_time; } @@ -78,7 +78,7 @@ public: * or NULL if it is a 'system' event. * \return The generating window. */ - virtual GHOST_IWindow *getWindow() + GHOST_IWindow *getWindow() { return m_window; } @@ -87,7 +87,7 @@ public: * Returns the event data. * \return The event data. */ - virtual GHOST_TEventDataPtr getData() + GHOST_TEventDataPtr getData() { return m_data; } diff --git a/intern/ghost/intern/GHOST_EventManager.h b/intern/ghost/intern/GHOST_EventManager.h index 8e513b4ee76..c8b5d1debe5 100644 --- a/intern/ghost/intern/GHOST_EventManager.h +++ b/intern/ghost/intern/GHOST_EventManager.h @@ -58,27 +58,27 @@ public: /** * Destructor. */ - virtual ~GHOST_EventManager(); + ~GHOST_EventManager(); /** * Returns the number of events currently on the stack. * \return The number of events on the stack. */ - virtual GHOST_TUns32 getNumEvents(); + GHOST_TUns32 getNumEvents(); /** * Returns the number of events of a certain type currently on the stack. * \param type The type of events to be counted. * \return The number of events on the stack of this type. */ - virtual GHOST_TUns32 getNumEvents(GHOST_TEventType type); + GHOST_TUns32 getNumEvents(GHOST_TEventType type); /** * Return the event at the top of the stack without removal. * Do not delete the event! * \return The event at the top of the stack. */ - virtual GHOST_IEvent *peekEvent(); + GHOST_IEvent *peekEvent(); /** * Pushes an event on the stack. @@ -86,47 +86,47 @@ public: * Do not delete the event! * \param event The event to push on the stack. */ - virtual GHOST_TSuccess pushEvent(GHOST_IEvent *event); + GHOST_TSuccess pushEvent(GHOST_IEvent *event); /** * Dispatches the given event directly, bypassing the event stack. * \return Indication as to whether any of the consumers handled the event. */ - virtual bool dispatchEvent(GHOST_IEvent *event); + bool dispatchEvent(GHOST_IEvent *event); /** * Dispatches the event at the back of the stack. * The event will be removed from the stack. * \return Indication as to whether any of the consumers handled the event. */ - virtual bool dispatchEvent(); + bool dispatchEvent(); /** * Dispatches all the events on the stack. * The event stack will be empty afterwards. * \return Indication as to whether any of the consumers handled the events. */ - virtual bool dispatchEvents(); + bool dispatchEvents(); /** * Adds a consumer to the list of event consumers. * \param consumer The consumer added to the list. * \return Indication as to whether addition has succeeded. */ - virtual GHOST_TSuccess addConsumer(GHOST_IEventConsumer *consumer); + GHOST_TSuccess addConsumer(GHOST_IEventConsumer *consumer); /** * Removes a consumer from the list of event consumers. * \param consumer The consumer removed from the list. * \return Indication as to whether removal has succeeded. */ - virtual GHOST_TSuccess removeConsumer(GHOST_IEventConsumer *consumer); + GHOST_TSuccess removeConsumer(GHOST_IEventConsumer *consumer); /** * Removes all events for a window from the stack. * \param window The window to remove events for. */ - virtual void + void removeWindowEvents( GHOST_IWindow *window ); @@ -138,7 +138,7 @@ public: * \param type The type of events to be removed. * \param window The window to remove the events for. */ - virtual void + void removeTypeEvents( GHOST_TEventType type, GHOST_IWindow *window = NULL @@ -150,12 +150,12 @@ protected: * Delete the event after use! * \return The event at the top of the stack. */ - virtual GHOST_IEvent *popEvent(); + GHOST_IEvent *popEvent(); /** * Removes all events from the stack. */ - virtual void disposeEvents(); + void disposeEvents(); /** A stack with events. */ typedef std::deque<GHOST_IEvent *> TEventStack; diff --git a/intern/ghost/intern/GHOST_EventPrinter.h b/intern/ghost/intern/GHOST_EventPrinter.h index 280d4208413..0cbb7ca467d 100644 --- a/intern/ghost/intern/GHOST_EventPrinter.h +++ b/intern/ghost/intern/GHOST_EventPrinter.h @@ -49,7 +49,7 @@ public: * \param event The event that can be handled or not. * \return Indication as to whether the event was handled. */ - virtual bool processEvent(GHOST_IEvent *event); + bool processEvent(GHOST_IEvent *event); protected: /** diff --git a/intern/ghost/intern/GHOST_ModifierKeys.h b/intern/ghost/intern/GHOST_ModifierKeys.h index 8189006f602..75173f5a525 100644 --- a/intern/ghost/intern/GHOST_ModifierKeys.h +++ b/intern/ghost/intern/GHOST_ModifierKeys.h @@ -47,7 +47,7 @@ struct GHOST_ModifierKeys { */ GHOST_ModifierKeys(); - virtual ~GHOST_ModifierKeys(); + ~GHOST_ModifierKeys(); /** * Returns the modifier key's key code from a modifier key mask. @@ -62,26 +62,26 @@ struct GHOST_ModifierKeys { * \param mask. Key state to return. * \return The state of the key (pressed == true). */ - virtual bool get(GHOST_TModifierKeyMask mask) const; + bool get(GHOST_TModifierKeyMask mask) const; /** * Updates the state of a single modifier key. * \param mask. Key state to update. * \param down. The new state of the key. */ - virtual void set(GHOST_TModifierKeyMask mask, bool down); + void set(GHOST_TModifierKeyMask mask, bool down); /** * Sets the state of all modifier keys to up. */ - virtual void clear(); + void clear(); /** * Determines whether to modifier key states are equal. * \param keys. The modifier key state to compare to. * \return Indication of equality. */ - virtual bool equals(const GHOST_ModifierKeys& keys) const; + bool equals(const GHOST_ModifierKeys& keys) const; /** Bitfield that stores the appropriate key state. */ GHOST_TUns8 m_LeftShift : 1; diff --git a/intern/ghost/intern/GHOST_System.h b/intern/ghost/intern/GHOST_System.h index 79230b0f505..4f689ce43c9 100644 --- a/intern/ghost/intern/GHOST_System.h +++ b/intern/ghost/intern/GHOST_System.h @@ -97,7 +97,7 @@ public: * \param userData Placeholder for user data. * \return A timer task (0 if timer task installation failed). */ - virtual GHOST_ITimerTask *installTimer(GHOST_TUns64 delay, + GHOST_ITimerTask *installTimer(GHOST_TUns64 delay, GHOST_TUns64 interval, GHOST_TimerProcPtr timerProc, GHOST_TUserDataPtr userData = NULL); @@ -107,7 +107,7 @@ public: * \param timerTask Timer task to be removed. * \return Indication of success. */ - virtual GHOST_TSuccess removeTimer(GHOST_ITimerTask *timerTask); + GHOST_TSuccess removeTimer(GHOST_ITimerTask *timerTask); /*************************************************************************************** * Display/window management functionality @@ -126,14 +126,14 @@ public: * \param window Pointer to the window to be disposed. * \return Indication of success. */ - virtual GHOST_TSuccess disposeWindow(GHOST_IWindow *window); + GHOST_TSuccess disposeWindow(GHOST_IWindow *window); /** * Returns whether a window is valid. * \param window Pointer to the window to be checked. * \return Indication of validity. */ - virtual bool validWindow(GHOST_IWindow *window); + bool validWindow(GHOST_IWindow *window); /** * Begins full screen mode. @@ -143,7 +143,7 @@ public: * This window is invalid after full screen has been ended. * \return Indication of success. */ - virtual GHOST_TSuccess beginFullScreen(const GHOST_DisplaySetting& setting, GHOST_IWindow **window, + GHOST_TSuccess beginFullScreen(const GHOST_DisplaySetting& setting, GHOST_IWindow **window, const bool stereoVisual, const GHOST_TUns16 numOfAASamples = 0); /** @@ -153,26 +153,26 @@ public: * * \return Indication of success. */ - virtual GHOST_TSuccess updateFullScreen(const GHOST_DisplaySetting& setting, GHOST_IWindow **window); + GHOST_TSuccess updateFullScreen(const GHOST_DisplaySetting& setting, GHOST_IWindow **window); /** * Ends full screen mode. * \return Indication of success. */ - virtual GHOST_TSuccess endFullScreen(void); + GHOST_TSuccess endFullScreen(void); /** * Returns current full screen mode status. * \return The current status. */ - virtual bool getFullScreen(void); + bool getFullScreen(void); /** * Native pixel size support (MacBook 'retina'). * \return The pixel size in float. */ - virtual bool useNativePixel(void); + bool useNativePixel(void); bool m_nativePixel; /*************************************************************************************** @@ -192,21 +192,21 @@ public: * The event stack will be empty afterwards. * \return Indication as to whether any of the consumers handled the events. */ - virtual bool dispatchEvents(); + bool dispatchEvents(); /** * Adds the given event consumer to our list. * \param consumer The event consumer to add. * \return Indication of success. */ - virtual GHOST_TSuccess addEventConsumer(GHOST_IEventConsumer *consumer); + GHOST_TSuccess addEventConsumer(GHOST_IEventConsumer *consumer); /** * Remove the given event consumer to our list. * \param consumer The event consumer to remove. * \return Indication of success. */ - virtual GHOST_TSuccess removeEventConsumer(GHOST_IEventConsumer *consumer); + GHOST_TSuccess removeEventConsumer(GHOST_IEventConsumer *consumer); /*************************************************************************************** * Cursor management functionality @@ -227,7 +227,7 @@ public: * \param isDown The state of a modifier key (true == pressed). * \return Indication of success. */ - virtual GHOST_TSuccess getModifierKeyState(GHOST_TModifierKeyMask mask, bool& isDown) const; + GHOST_TSuccess getModifierKeyState(GHOST_TModifierKeyMask mask, bool& isDown) const; /** * Returns the state of a mouse button (ouside the message queue). @@ -235,7 +235,7 @@ public: * \param isDown Button state. * \return Indication of success. */ - virtual GHOST_TSuccess getButtonState(GHOST_TButtonMask mask, bool& isDown) const; + GHOST_TSuccess getButtonState(GHOST_TButtonMask mask, bool& isDown) const; /*************************************************************************************** * Other (internal) functionality. @@ -247,28 +247,28 @@ public: * Do not delete the event! * \param event The event to push on the stack. */ - virtual GHOST_TSuccess pushEvent(GHOST_IEvent *event); + GHOST_TSuccess pushEvent(GHOST_IEvent *event); /** * \return The timer manager. */ - inline virtual GHOST_TimerManager *getTimerManager() const; + inline GHOST_TimerManager *getTimerManager() const; /** * \return A pointer to our event manager. */ - virtual inline GHOST_EventManager *getEventManager() const; + inline GHOST_EventManager *getEventManager() const; /** * \return A pointer to our window manager. */ - virtual inline GHOST_WindowManager *getWindowManager() const; + inline GHOST_WindowManager *getWindowManager() const; #ifdef WITH_INPUT_NDOF /** * \return A pointer to our n-degree of freedom manager. */ - virtual inline GHOST_NDOFManager *getNDOFManager() const; + inline GHOST_NDOFManager *getNDOFManager() const; #endif /** @@ -326,7 +326,7 @@ protected: * \param window The window created. * \return Indication of success. */ - virtual GHOST_TSuccess createFullScreenWindow(GHOST_Window **window, const GHOST_DisplaySetting &settings, + GHOST_TSuccess createFullScreenWindow(GHOST_Window **window, const GHOST_DisplaySetting &settings, const bool stereoVisual, const GHOST_TUns16 numOfAASamples = 0); /** The display manager (platform dependent). */ diff --git a/intern/ghost/intern/GHOST_SystemCocoa.h b/intern/ghost/intern/GHOST_SystemCocoa.h index 9b30abe75d5..72a4d7dd87b 100644 --- a/intern/ghost/intern/GHOST_SystemCocoa.h +++ b/intern/ghost/intern/GHOST_SystemCocoa.h @@ -71,7 +71,7 @@ public: * Based on ANSI clock() routine. * \return The number of milliseconds. */ - virtual GHOST_TUns64 getMilliSeconds() const; + GHOST_TUns64 getMilliSeconds() const; /*************************************************************************************** * Display/window management functionality @@ -81,18 +81,18 @@ public: * Returns the number of displays on this system. * \return The number of displays. */ - virtual GHOST_TUns8 getNumDisplays() const; + GHOST_TUns8 getNumDisplays() const; /** * Returns the dimensions of the main display on this system. * \return The dimension of the main display. */ - virtual void getMainDisplayDimensions(GHOST_TUns32& width, GHOST_TUns32& height) const; + void getMainDisplayDimensions(GHOST_TUns32& width, GHOST_TUns32& height) const; /** Returns the combine dimensions of all monitors. * \return The dimension of the workspace. */ - virtual void getAllDisplayDimensions(GHOST_TUns32& width, GHOST_TUns32& height) const; + void getAllDisplayDimensions(GHOST_TUns32& width, GHOST_TUns32& height) const; /** * Create a new window. @@ -110,7 +110,7 @@ public: * \param parentWindow Parent (embedder) window * \return The new window (or 0 if creation failed). */ - virtual GHOST_IWindow *createWindow( + GHOST_IWindow *createWindow( const STR_String& title, GHOST_TInt32 left, GHOST_TInt32 top, @@ -133,7 +133,7 @@ public: * \param waitForEvent Flag to wait for an event (or return immediately). * \return Indication of the presence of events. */ - virtual bool processEvents(bool waitForEvent); + bool processEvents(bool waitForEvent); /** * Handle User request to quit, from Menu bar Quit, and Cmd+Q @@ -169,7 +169,7 @@ public: * \param y The y-coordinate of the cursor. * \return Indication of success. */ - virtual GHOST_TSuccess getCursorPosition(GHOST_TInt32& x, GHOST_TInt32& y) const; + GHOST_TSuccess getCursorPosition(GHOST_TInt32& x, GHOST_TInt32& y) const; /** * Updates the location of the cursor (location in screen coordinates). @@ -177,7 +177,7 @@ public: * \param y The y-coordinate of the cursor. * \return Indication of success. */ - virtual GHOST_TSuccess setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y); + GHOST_TSuccess setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y); /*************************************************************************************** * Access to mouse button and keyboard states. @@ -188,28 +188,28 @@ public: * \param keys The state of all modifier keys (true == pressed). * \return Indication of success. */ - virtual GHOST_TSuccess getModifierKeys(GHOST_ModifierKeys& keys) const; + GHOST_TSuccess getModifierKeys(GHOST_ModifierKeys& keys) const; /** * Returns the state of the mouse buttons (ouside the message queue). * \param buttons The state of the buttons. * \return Indication of success. */ - virtual GHOST_TSuccess getButtons(GHOST_Buttons& buttons) const; + GHOST_TSuccess getButtons(GHOST_Buttons& buttons) const; /** * Returns Clipboard data * \param selection Indicate which buffer to return * \return Returns the selected buffer */ - virtual GHOST_TUns8 *getClipboard(bool selection) const; + GHOST_TUns8 *getClipboard(bool selection) const; /** * Puts buffer to system clipboard * \param buffer The buffer to be copied * \param selection Indicates which buffer to copy too, only used on X11 */ - virtual void putClipboard(GHOST_TInt8 *buffer, bool selection) const; + void putClipboard(GHOST_TInt8 *buffer, bool selection) const; /** * Handles a window event. Called by GHOST_WindowCocoa window delegate @@ -268,7 +268,7 @@ protected: * For now, it just registers the window class (WNDCLASS). * \return A success value. */ - virtual GHOST_TSuccess init(); + GHOST_TSuccess init(); /** * Performs the actual cursor position update (location in screen coordinates). diff --git a/intern/ghost/intern/GHOST_SystemPathsCocoa.h b/intern/ghost/intern/GHOST_SystemPathsCocoa.h index cd8d161ff9c..1c76284857c 100644 --- a/intern/ghost/intern/GHOST_SystemPathsCocoa.h +++ b/intern/ghost/intern/GHOST_SystemPathsCocoa.h @@ -57,20 +57,20 @@ public: * "unpack and run" path, then look for properly installed path, including versioning. * \return Unsigned char string pointing to system dir (eg /usr/share/blender/). */ - virtual const GHOST_TUns8 *getSystemDir(int version, const char *versionstr) const; + const GHOST_TUns8 *getSystemDir(int version, const char *versionstr) const; /** * Determine the base dir in which user configuration is stored, including versioning. * If needed, it will create the base directory. * \return Unsigned char string pointing to user dir (eg ~/.blender/). */ - virtual const GHOST_TUns8 *getUserDir(int version, const char *versionstr) const; + const GHOST_TUns8 *getUserDir(int version, const char *versionstr) const; /** * Determine the directory of the current binary * \return Unsigned char string pointing to the binary dir */ - virtual const GHOST_TUns8 *getBinaryDir() const; + const GHOST_TUns8 *getBinaryDir() const; /** * Add the file to the operating system most recently used files diff --git a/intern/ghost/intern/GHOST_SystemPathsWin32.h b/intern/ghost/intern/GHOST_SystemPathsWin32.h index c074a7902b8..b63d20bfcbd 100644 --- a/intern/ghost/intern/GHOST_SystemPathsWin32.h +++ b/intern/ghost/intern/GHOST_SystemPathsWin32.h @@ -60,7 +60,7 @@ public: /** * Destructor. */ - virtual ~GHOST_SystemPathsWin32(); + ~GHOST_SystemPathsWin32(); /** * Determine the base dir in which shared resources are located. It will first try to use diff --git a/intern/ghost/intern/GHOST_SystemPathsX11.h b/intern/ghost/intern/GHOST_SystemPathsX11.h index 1b5710e0f57..23cc2e4b104 100644 --- a/intern/ghost/intern/GHOST_SystemPathsX11.h +++ b/intern/ghost/intern/GHOST_SystemPathsX11.h @@ -48,7 +48,7 @@ public: /** * Destructor. */ - virtual ~GHOST_SystemPathsX11(); + ~GHOST_SystemPathsX11(); /** * Determine the base dir in which shared resources are located. It will first try to use diff --git a/intern/ghost/intern/GHOST_SystemWin32.h b/intern/ghost/intern/GHOST_SystemWin32.h index cb3b8ee3cfc..744f3a6a603 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.h +++ b/intern/ghost/intern/GHOST_SystemWin32.h @@ -69,7 +69,7 @@ public: /** * Destructor. */ - virtual ~GHOST_SystemWin32(); + ~GHOST_SystemWin32(); /*************************************************************************************** ** Time(r) functionality @@ -81,7 +81,7 @@ public: * This overloaded method uses the high frequency timer if available. * \return The number of milliseconds. */ - virtual GHOST_TUns64 getMilliSeconds() const; + GHOST_TUns64 getMilliSeconds() const; /*************************************************************************************** ** Display/window management functionality @@ -91,19 +91,19 @@ public: * Returns the number of displays on this system. * \return The number of displays. */ - virtual GHOST_TUns8 getNumDisplays() const; + GHOST_TUns8 getNumDisplays() const; /** * Returns the dimensions of the main display on this system. * \return The dimension of the main display. */ - virtual void getMainDisplayDimensions(GHOST_TUns32& width, GHOST_TUns32& height) const; + void getMainDisplayDimensions(GHOST_TUns32& width, GHOST_TUns32& height) const; /** * Returns the dimensions of all displays on this system. * \return The dimension of the main display. */ - virtual void getAllDisplayDimensions(GHOST_TUns32& width, GHOST_TUns32& height) const; + void getAllDisplayDimensions(GHOST_TUns32& width, GHOST_TUns32& height) const; /** * Create a new window. @@ -121,7 +121,7 @@ public: * \param parentWindow Parent (embedder) window * \return The new window (or 0 if creation failed). */ - virtual GHOST_IWindow *createWindow( + GHOST_IWindow *createWindow( const STR_String& title, GHOST_TInt32 left, GHOST_TInt32 top, GHOST_TUns32 width, GHOST_TUns32 height, GHOST_TWindowState state, GHOST_TDrawingContextType type, @@ -139,7 +139,7 @@ public: * \param waitForEvent Flag to wait for an event (or return immediately). * \return Indication of the presence of events. */ - virtual bool processEvents(bool waitForEvent); + bool processEvents(bool waitForEvent); /*************************************************************************************** @@ -152,7 +152,7 @@ public: * \param y The y-coordinate of the cursor. * \return Indication of success. */ - virtual GHOST_TSuccess getCursorPosition(GHOST_TInt32& x, GHOST_TInt32& y) const; + GHOST_TSuccess getCursorPosition(GHOST_TInt32& x, GHOST_TInt32& y) const; /** * Updates the location of the cursor (location in screen coordinates). @@ -160,7 +160,7 @@ public: * \param y The y-coordinate of the cursor. * \return Indication of success. */ - virtual GHOST_TSuccess setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y); + GHOST_TSuccess setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y); /*************************************************************************************** ** Access to mouse button and keyboard states. @@ -171,28 +171,28 @@ public: * \param keys The state of all modifier keys (true == pressed). * \return Indication of success. */ - virtual GHOST_TSuccess getModifierKeys(GHOST_ModifierKeys& keys) const; + GHOST_TSuccess getModifierKeys(GHOST_ModifierKeys& keys) const; /** * Returns the state of the mouse buttons (ouside the message queue). * \param buttons The state of the buttons. * \return Indication of success. */ - virtual GHOST_TSuccess getButtons(GHOST_Buttons& buttons) const; + GHOST_TSuccess getButtons(GHOST_Buttons& buttons) const; /** * Returns unsinged char from CUT_BUFFER0 * \param selection Used by X11 only * \return Returns the Clipboard */ - virtual GHOST_TUns8 *getClipboard(bool selection) const; + GHOST_TUns8 *getClipboard(bool selection) const; /** * Puts buffer to system clipboard * \param selection Used by X11 only * \return No return */ - virtual void putClipboard(GHOST_TInt8 *buffer, bool selection) const; + void putClipboard(GHOST_TInt8 *buffer, bool selection) const; /** * Creates a drag'n'drop event and pushes it immediately onto the event queue. @@ -210,7 +210,7 @@ public: * Confirms quitting he program when there is just one window left open * in the application */ - virtual int confirmQuit(GHOST_IWindow *window) const; + int confirmQuit(GHOST_IWindow *window) const; protected: /** @@ -218,13 +218,13 @@ protected: * For now, it just registers the window class (WNDCLASS). * \return A success value. */ - virtual GHOST_TSuccess init(); + GHOST_TSuccess init(); /** * Closes the system down. * \return A success value. */ - virtual GHOST_TSuccess exit(); + GHOST_TSuccess exit(); /** * Converts raw WIN32 key codes from the wndproc to GHOST keys. @@ -234,7 +234,7 @@ protected: * \param extend Flag if key is not primly (left or right) * \return The GHOST key (GHOST_kKeyUnknown if no match). */ - virtual GHOST_TKey convertKey(GHOST_IWindow *window, short vKey, short ScanCode, short extend) const; + GHOST_TKey convertKey(GHOST_IWindow *window, short vKey, short ScanCode, short extend) const; /** * Catches raw WIN32 key codes from WM_INPUT in the wndproc. @@ -244,7 +244,7 @@ protected: * \param vk Pointer to virtual key * \return The GHOST key (GHOST_kKeyUnknown if no match). */ - virtual GHOST_TKey hardKey(GHOST_IWindow *window, RAWINPUT const& raw, int *keyDown, char *vk); + GHOST_TKey hardKey(GHOST_IWindow *window, RAWINPUT const& raw, int *keyDown, char *vk); /** * Creates modifier key event(s) and updates the key data stored locally (m_modifierKeys). @@ -296,7 +296,7 @@ protected: * \param vKey The virtual key from hardKey * \param ScanCode The ScanCode of pressed key (simular to PS/2 Set 1) */ - virtual GHOST_TKey processSpecialKey(GHOST_IWindow *window, short vKey, short scanCode) const; + GHOST_TKey processSpecialKey(GHOST_IWindow *window, short vKey, short scanCode) const; /** * Creates a window event. @@ -336,19 +336,19 @@ protected: * Returns the local state of the modifier keys (from the message queue). * \param keys The state of the keys. */ - inline virtual void retrieveModifierKeys(GHOST_ModifierKeys& keys) const; + inline void retrieveModifierKeys(GHOST_ModifierKeys& keys) const; /** * Stores the state of the modifier keys locally. * For internal use only! * param keys The new state of the modifier keys. */ - inline virtual void storeModifierKeys(const GHOST_ModifierKeys& keys); + inline void storeModifierKeys(const GHOST_ModifierKeys& keys); /** * Check current key layout for AltGr */ - inline virtual void handleKeyboardChange(void); + inline void handleKeyboardChange(void); /** * Windows call back routine for our window class. diff --git a/intern/ghost/intern/GHOST_SystemX11.h b/intern/ghost/intern/GHOST_SystemX11.h index be149cbb773..bc35b6c6026 100644 --- a/intern/ghost/intern/GHOST_SystemX11.h +++ b/intern/ghost/intern/GHOST_SystemX11.h @@ -75,7 +75,7 @@ public: /** * Destructor. */ - virtual ~GHOST_SystemX11(); + ~GHOST_SystemX11(); GHOST_TSuccess diff --git a/intern/ghost/intern/GHOST_TimerManager.h b/intern/ghost/intern/GHOST_TimerManager.h index b94175e9ff8..6cf4bcf40eb 100644 --- a/intern/ghost/intern/GHOST_TimerManager.h +++ b/intern/ghost/intern/GHOST_TimerManager.h @@ -58,19 +58,19 @@ public: /** * Destructor. */ - virtual ~GHOST_TimerManager(); + ~GHOST_TimerManager(); /** * Returns the number of timer tasks. * \return The number of events on the stack. */ - virtual GHOST_TUns32 getNumTimers(); + GHOST_TUns32 getNumTimers(); /** * Returns whether this timer task ins in our list. * \return Indication of presence. */ - virtual bool getTimerFound(GHOST_TimerTask *timer); + bool getTimerFound(GHOST_TimerTask *timer); /** * Adds a timer task to the list. @@ -78,7 +78,7 @@ public: * \param timer The timer task added to the list. * \return Indication as to whether addition has succeeded. */ - virtual GHOST_TSuccess addTimer(GHOST_TimerTask *timer); + GHOST_TSuccess addTimer(GHOST_TimerTask *timer); /** * Removes a timer task from the list. @@ -86,21 +86,21 @@ public: * \param timer The timer task to be removed from the list. * \return Indication as to whether removal has succeeded. */ - virtual GHOST_TSuccess removeTimer(GHOST_TimerTask *timer); + GHOST_TSuccess removeTimer(GHOST_TimerTask *timer); /** * Finds the soonest time the next timer would fire. * \return The soonest time the next timer would fire, * or GHOST_kFireTimeNever if no timers exist. */ - virtual GHOST_TUns64 nextFireTime(); + GHOST_TUns64 nextFireTime(); /** * Checks all timer tasks to see if they are expired and fires them if needed. * \param time The current time. * \return True if any timers were fired. */ - virtual bool fireTimers(GHOST_TUns64 time); + bool fireTimers(GHOST_TUns64 time); /** * Checks this timer task to see if they are expired and fires them if needed. @@ -108,7 +108,7 @@ public: * \param task The timer task to check and optionally fire. * \return True if the timer fired. */ - virtual bool fireTimer(GHOST_TUns64 time, GHOST_TimerTask *task); + bool fireTimer(GHOST_TUns64 time, GHOST_TimerTask *task); protected: /** diff --git a/intern/ghost/intern/GHOST_TimerTask.h b/intern/ghost/intern/GHOST_TimerTask.h index e33788ec826..201ed144712 100644 --- a/intern/ghost/intern/GHOST_TimerTask.h +++ b/intern/ghost/intern/GHOST_TimerTask.h @@ -68,7 +68,7 @@ public: * Returns the timer start time. * \return The timer start time. */ - inline virtual GHOST_TUns64 getStart() const + inline GHOST_TUns64 getStart() const { return m_start; } @@ -77,7 +77,7 @@ public: * Changes the timer start time. * \param start The timer start time. */ - virtual void setStart(GHOST_TUns64 start) + void setStart(GHOST_TUns64 start) { m_start = start; } @@ -86,7 +86,7 @@ public: * Returns the timer interval. * \return The timer interval. */ - inline virtual GHOST_TUns64 getInterval() const + inline GHOST_TUns64 getInterval() const { return m_interval; } @@ -95,7 +95,7 @@ public: * Changes the timer interval. * \param interval The timer interval. */ - virtual void setInterval(GHOST_TUns64 interval) + void setInterval(GHOST_TUns64 interval) { m_interval = interval; } @@ -104,7 +104,7 @@ public: * Returns the time the timerProc will be called. * \return The time the timerProc will be called. */ - inline virtual GHOST_TUns64 getNext() const + inline GHOST_TUns64 getNext() const { return m_next; } @@ -113,7 +113,7 @@ public: * Changes the time the timerProc will be called. * \param next The time the timerProc will be called. */ - virtual void setNext(GHOST_TUns64 next) + void setNext(GHOST_TUns64 next) { m_next = next; } @@ -122,7 +122,7 @@ public: * Returns the timer callback. * \return the timer callback. */ - inline virtual GHOST_TimerProcPtr getTimerProc() const + inline GHOST_TimerProcPtr getTimerProc() const { return m_timerProc; } @@ -131,7 +131,7 @@ public: * Changes the timer callback. * \param The timer callback. */ - inline virtual void setTimerProc(const GHOST_TimerProcPtr timerProc) + inline void setTimerProc(const GHOST_TimerProcPtr timerProc) { m_timerProc = timerProc; } @@ -140,7 +140,7 @@ public: * Returns the timer user data. * \return The timer user data. */ - inline virtual GHOST_TUserDataPtr getUserData() const + inline GHOST_TUserDataPtr getUserData() const { return m_userData; } @@ -149,7 +149,7 @@ public: * Changes the time user data. * \param data The timer user data. */ - virtual void setUserData(const GHOST_TUserDataPtr userData) + void setUserData(const GHOST_TUserDataPtr userData) { m_userData = userData; } @@ -158,7 +158,7 @@ public: * Returns the auxiliary storage room. * \return The auxiliary storage room. */ - inline virtual GHOST_TUns32 getAuxData() const + inline GHOST_TUns32 getAuxData() const { return m_auxData; } @@ -167,7 +167,7 @@ public: * Changes the auxiliary storage room. * \param auxData The auxiliary storage room. */ - virtual void setAuxData(GHOST_TUns32 auxData) + void setAuxData(GHOST_TUns32 auxData) { m_auxData = auxData; } diff --git a/intern/ghost/intern/GHOST_Window.h b/intern/ghost/intern/GHOST_Window.h index ac31c54666b..b78a690fcad 100644 --- a/intern/ghost/intern/GHOST_Window.h +++ b/intern/ghost/intern/GHOST_Window.h @@ -119,14 +119,14 @@ public: * Returns the current cursor shape. * \return The current cursor shape. */ - inline virtual GHOST_TStandardCursor getCursorShape() const; + inline GHOST_TStandardCursor getCursorShape() const; /** * Set the shape of the cursor. * \param cursor The new cursor shape type id. * \return Indication of success. */ - virtual GHOST_TSuccess setCursorShape(GHOST_TStandardCursor cursorShape); + GHOST_TSuccess setCursorShape(GHOST_TStandardCursor cursorShape); /** * Set the shape of the cursor to a custom cursor. @@ -136,47 +136,47 @@ public: * \param hotY The Y coordinate of the cursor hotspot. * \return Indication of success. */ - virtual GHOST_TSuccess setCustomCursorShape(GHOST_TUns8 bitmap[16][2], - GHOST_TUns8 mask[16][2], - int hotX, - int hotY); - - virtual GHOST_TSuccess setCustomCursorShape(GHOST_TUns8 *bitmap, - GHOST_TUns8 *mask, - int sizex, int sizey, - int hotX, int hotY, - int fg_color, int bg_color); - + GHOST_TSuccess setCustomCursorShape(GHOST_TUns8 bitmap[16][2], + GHOST_TUns8 mask[16][2], + int hotX, + int hotY); + + GHOST_TSuccess setCustomCursorShape(GHOST_TUns8 *bitmap, + GHOST_TUns8 *mask, + int sizex, int sizey, + int hotX, int hotY, + int fg_color, int bg_color); + /** * Returns the visibility state of the cursor. * \return The visibility state of the cursor. */ - inline virtual bool getCursorVisibility() const; - inline virtual GHOST_TGrabCursorMode getCursorGrabMode() const; - inline virtual bool getCursorGrabModeIsWarp() const; - inline virtual void getCursorGrabInitPos(GHOST_TInt32 &x, GHOST_TInt32 &y) const; - inline virtual void getCursorGrabAccum(GHOST_TInt32 &x, GHOST_TInt32 &y) const; - inline virtual void setCursorGrabAccum(GHOST_TInt32 x, GHOST_TInt32 y); + inline bool getCursorVisibility() const; + inline GHOST_TGrabCursorMode getCursorGrabMode() const; + inline bool getCursorGrabModeIsWarp() const; + inline void getCursorGrabInitPos(GHOST_TInt32 &x, GHOST_TInt32 &y) const; + inline void getCursorGrabAccum(GHOST_TInt32 &x, GHOST_TInt32 &y) const; + inline void setCursorGrabAccum(GHOST_TInt32 x, GHOST_TInt32 y); /** * Shows or hides the cursor. * \param visible The new visibility state of the cursor. * \return Indication of success. */ - virtual GHOST_TSuccess setCursorVisibility(bool visible); + GHOST_TSuccess setCursorVisibility(bool visible); /** * Sets the cursor grab. * \param mode The new grab state of the cursor. * \return Indication of success. */ - virtual GHOST_TSuccess setCursorGrab(GHOST_TGrabCursorMode mode, GHOST_Rect *bounds, GHOST_TInt32 mouse_ungrab_xy[2]); + GHOST_TSuccess setCursorGrab(GHOST_TGrabCursorMode mode, GHOST_Rect *bounds, GHOST_TInt32 mouse_ungrab_xy[2]); /** * Gets the cursor grab region, if unset the window is used. * reset when grab is disabled. */ - virtual GHOST_TSuccess getCursorGrabBounds(GHOST_Rect& bounds); + GHOST_TSuccess getCursorGrabBounds(GHOST_Rect& bounds); /** * Sets the progress bar value displayed in the window/application icon @@ -198,30 +198,30 @@ public: * \param interval The swap interval to use. * \return A boolean success indicator. */ - virtual GHOST_TSuccess setSwapInterval(int interval); + GHOST_TSuccess setSwapInterval(int interval); /** * Gets the current swap interval for swapBuffers. * \return An integer. */ - virtual GHOST_TSuccess getSwapInterval(int& intervalOut); + GHOST_TSuccess getSwapInterval(int& intervalOut); /** * Gets the current swap interval for swapBuffers. * \return Number of AA Samples (0 if there is no multisample buffer) */ - virtual GHOST_TUns16 getNumOfAASamples(); + GHOST_TUns16 getNumOfAASamples(); /** * Tells if the ongoing drag'n'drop object can be accepted upon mouse drop */ - virtual void setAcceptDragOperation(bool canAccept); + void setAcceptDragOperation(bool canAccept); /** * Returns acceptance of the dropped object * Usually called by the "object dropped" event handling function */ - virtual bool canAcceptDragOperation() const; + bool canAcceptDragOperation() const; /** * Sets the window "modified" status, indicating unsaved changes @@ -240,7 +240,7 @@ public: * Returns the type of drawing context used in this window. * \return The current type of drawing context. */ - inline virtual GHOST_TDrawingContextType getDrawingContextType(); + inline GHOST_TDrawingContextType getDrawingContextType(); /** * Tries to install a rendering context in this window. @@ -249,7 +249,7 @@ public: * \param type The type of rendering context installed. * \return Indication as to whether installation has succeeded. */ - virtual GHOST_TSuccess setDrawingContextType(GHOST_TDrawingContextType type); + GHOST_TSuccess setDrawingContextType(GHOST_TDrawingContextType type); /** * Swaps front and back buffers of a window. @@ -268,13 +268,13 @@ public: * whenever the window is changed. * \return Indication of success. */ - virtual GHOST_TSuccess updateDrawingContext(); + GHOST_TSuccess updateDrawingContext(); /** * Returns the window user data. * \return The window user data. */ - inline virtual GHOST_TUserDataPtr getUserData() const + inline GHOST_TUserDataPtr getUserData() const { return m_userData; } @@ -283,12 +283,12 @@ public: * Changes the window user data. * \param data The window user data. */ - virtual void setUserData(const GHOST_TUserDataPtr userData) + void setUserData(const GHOST_TUserDataPtr userData) { m_userData = userData; } - virtual float getNativePixelSize(void) + float getNativePixelSize(void) { if (m_nativePixelSize > 0.0f) return m_nativePixelSize; diff --git a/intern/ghost/intern/GHOST_WindowCocoa.h b/intern/ghost/intern/GHOST_WindowCocoa.h index ac0973684d3..3ed88086184 100644 --- a/intern/ghost/intern/GHOST_WindowCocoa.h +++ b/intern/ghost/intern/GHOST_WindowCocoa.h @@ -81,77 +81,77 @@ public: * Destructor. * Closes the window and disposes resources allocated. */ - virtual ~GHOST_WindowCocoa(); + ~GHOST_WindowCocoa(); /** * Returns indication as to whether the window is valid. * \return The validity of the window. */ - virtual bool getValid() const; + bool getValid() const; /** * Returns the associated NSWindow object * \return The associated NSWindow object */ - virtual void *getOSWindow() const; + void *getOSWindow() const; /** * Sets the title displayed in the title bar. * \param title The title to display in the title bar. */ - virtual void setTitle(const STR_String& title); + void setTitle(const STR_String& title); /** * Returns the title displayed in the title bar. * \param title The title displayed in the title bar. */ - virtual void getTitle(STR_String& title) const; + void getTitle(STR_String& title) const; /** * Returns the window rectangle dimensions. * The dimensions are given in screen coordinates that are relative to the upper-left corner of the screen. * \param bounds The bounding rectangle of the window. */ - virtual void getWindowBounds(GHOST_Rect& bounds) const; + void getWindowBounds(GHOST_Rect& bounds) const; /** * Returns the client rectangle dimensions. * The left and top members of the rectangle are always zero. * \param bounds The bounding rectangle of the client area of the window. */ - virtual void getClientBounds(GHOST_Rect& bounds) const; + void getClientBounds(GHOST_Rect& bounds) const; /** * Resizes client rectangle width. * \param width The new width of the client area of the window. */ - virtual GHOST_TSuccess setClientWidth(GHOST_TUns32 width); + GHOST_TSuccess setClientWidth(GHOST_TUns32 width); /** * Resizes client rectangle height. * \param height The new height of the client area of the window. */ - virtual GHOST_TSuccess setClientHeight(GHOST_TUns32 height); + GHOST_TSuccess setClientHeight(GHOST_TUns32 height); /** * Resizes client rectangle. * \param width The new width of the client area of the window. * \param height The new height of the client area of the window. */ - virtual GHOST_TSuccess setClientSize(GHOST_TUns32 width, GHOST_TUns32 height); + GHOST_TSuccess setClientSize(GHOST_TUns32 width, GHOST_TUns32 height); /** * Returns the state of the window (normal, minimized, maximized). * \return The state of the window. */ - virtual GHOST_TWindowState getState() const; + GHOST_TWindowState getState() const; /** * Sets the window "modified" status, indicating unsaved changes * \param isUnsavedChanges Unsaved changes or not * \return Indication of success. */ - virtual GHOST_TSuccess setModifiedState(bool isUnsavedChanges); + GHOST_TSuccess setModifiedState(bool isUnsavedChanges); /** * Converts a point in screen coordinates to client rectangle coordinates @@ -160,7 +160,7 @@ public: * \param outX The x-coordinate in the client rectangle. * \param outY The y-coordinate in the client rectangle. */ - virtual void screenToClient(GHOST_TInt32 inX, GHOST_TInt32 inY, GHOST_TInt32& outX, GHOST_TInt32& outY) const; + void screenToClient(GHOST_TInt32 inX, GHOST_TInt32 inY, GHOST_TInt32& outX, GHOST_TInt32& outY) const; /** * Converts a point in screen coordinates to client rectangle coordinates @@ -169,7 +169,7 @@ public: * \param outX The x-coordinate on the screen. * \param outY The y-coordinate on the screen. */ - virtual void clientToScreen(GHOST_TInt32 inX, GHOST_TInt32 inY, GHOST_TInt32& outX, GHOST_TInt32& outY) const; + void clientToScreen(GHOST_TInt32 inX, GHOST_TInt32 inY, GHOST_TInt32& outX, GHOST_TInt32& outY) const; /** * Converts a point in screen coordinates to client rectangle coordinates @@ -202,16 +202,16 @@ public: * \param state The state of the window. * \return Indication of success. */ - virtual GHOST_TSuccess setState(GHOST_TWindowState state); + GHOST_TSuccess setState(GHOST_TWindowState state); /** * Sets the order of the window (bottom, top). * \param order The order of the window. * \return Indication of success. */ - virtual GHOST_TSuccess setOrder(GHOST_TWindowOrder order); + GHOST_TSuccess setOrder(GHOST_TWindowOrder order); - virtual void loadCursor(bool visible, GHOST_TStandardCursor cursor) const; + void loadCursor(bool visible, GHOST_TStandardCursor cursor) const; const GHOST_TabletData *GetTabletData() { @@ -227,15 +227,15 @@ public: * Sets the progress bar value displayed in the window/application icon * \param progress The progress % (0.0 to 1.0) */ - virtual GHOST_TSuccess setProgressBar(float progress); + GHOST_TSuccess setProgressBar(float progress); /** * Hides the progress bar icon */ - virtual GHOST_TSuccess endProgressBar(); + GHOST_TSuccess endProgressBar(); - virtual void setNativePixelSize(void); + void setNativePixelSize(void); GHOST_TSuccess beginFullScreen() const {return GHOST_kFailure;} @@ -254,40 +254,40 @@ protected: * \param type The type of rendering context create. * \return Indication of success. */ - virtual GHOST_Context *newDrawingContext(GHOST_TDrawingContextType type); + GHOST_Context *newDrawingContext(GHOST_TDrawingContextType type); /** * Invalidates the contents of this window. * \return Indication of success. */ - virtual GHOST_TSuccess invalidate(); + GHOST_TSuccess invalidate(); /** * Sets the cursor visibility on the window using * native window system calls. */ - virtual GHOST_TSuccess setWindowCursorVisibility(bool visible); + GHOST_TSuccess setWindowCursorVisibility(bool visible); /** * Sets the cursor grab on the window using * native window system calls. */ - virtual GHOST_TSuccess setWindowCursorGrab(GHOST_TGrabCursorMode mode); + GHOST_TSuccess setWindowCursorGrab(GHOST_TGrabCursorMode mode); /** * Sets the cursor shape on the window using * native window system calls. */ - virtual GHOST_TSuccess setWindowCursorShape(GHOST_TStandardCursor shape); + GHOST_TSuccess setWindowCursorShape(GHOST_TStandardCursor shape); /** * Sets the cursor shape on the window using * native window system calls. */ - virtual GHOST_TSuccess setWindowCustomCursorShape(GHOST_TUns8 *bitmap, GHOST_TUns8 *mask, + GHOST_TSuccess setWindowCustomCursorShape(GHOST_TUns8 *bitmap, GHOST_TUns8 *mask, int sizex, int sizey, int hotX, int hotY, int fg_color, int bg_color); - virtual GHOST_TSuccess setWindowCustomCursorShape(GHOST_TUns8 bitmap[16][2], GHOST_TUns8 mask[16][2], int hotX, int hotY); + GHOST_TSuccess setWindowCustomCursorShape(GHOST_TUns8 bitmap[16][2], GHOST_TUns8 mask[16][2], int hotX, int hotY); /** The window containing the OpenGL view */ CocoaWindow *m_window; diff --git a/intern/ghost/intern/GHOST_WindowManager.h b/intern/ghost/intern/GHOST_WindowManager.h index 8297e4d24d2..e868a9b0416 100644 --- a/intern/ghost/intern/GHOST_WindowManager.h +++ b/intern/ghost/intern/GHOST_WindowManager.h @@ -55,7 +55,7 @@ public: /** * Destructor. */ - virtual ~GHOST_WindowManager(); + ~GHOST_WindowManager(); /** * Add a window to our list. @@ -63,67 +63,67 @@ public: * \param window Pointer to the window to be added. * \return Indication of success. */ - virtual GHOST_TSuccess addWindow(GHOST_IWindow *window); + GHOST_TSuccess addWindow(GHOST_IWindow *window); /** * Remove a window from our list. * \param window Pointer to the window to be removed. * \return Indication of success. */ - virtual GHOST_TSuccess removeWindow(const GHOST_IWindow *window); + GHOST_TSuccess removeWindow(const GHOST_IWindow *window); /** * Returns whether the window is in our list. * \param window Pointer to the window to query. * \return A boolean indicator. */ - virtual bool getWindowFound(const GHOST_IWindow *window) const; + bool getWindowFound(const GHOST_IWindow *window) const; /** * Returns whether one of the windows is fullscreen. * \return A boolean indicator. */ - virtual bool getFullScreen(void) const; + bool getFullScreen(void) const; /** * Returns pointer to the full-screen window. * \return The full-screen window (NULL if not in full-screen). */ - virtual GHOST_IWindow *getFullScreenWindow(void) const; + GHOST_IWindow *getFullScreenWindow(void) const; /** * Activates fullscreen mode for a window. * \param window The window displayed fullscreen. * \return Indication of success. */ - virtual GHOST_TSuccess beginFullScreen(GHOST_IWindow *window, const bool stereoVisual); + GHOST_TSuccess beginFullScreen(GHOST_IWindow *window, const bool stereoVisual); /** * Closes fullscreen mode down. * \return Indication of success. */ - virtual GHOST_TSuccess endFullScreen(void); + GHOST_TSuccess endFullScreen(void); /** * Sets new window as active window (the window receiving events). * There can be only one window active which should be in the current window list. * \param window The new active window. */ - virtual GHOST_TSuccess setActiveWindow(GHOST_IWindow *window); + GHOST_TSuccess setActiveWindow(GHOST_IWindow *window); /** * Returns the active window (the window receiving events). * There can be only one window active which should be in the current window list. * \return window The active window (or NULL if there is none). */ - virtual GHOST_IWindow *getActiveWindow(void) const; + GHOST_IWindow *getActiveWindow(void) const; /** * Set this window to be inactive (not receiving events). * \param window The window to deactivate. */ - virtual void setWindowInactive(const GHOST_IWindow *window); + void setWindowInactive(const GHOST_IWindow *window); /** @@ -140,7 +140,7 @@ public: * \param osWindow The OS window object/handle * \return The associated window, null if none corresponds */ - virtual GHOST_IWindow *getWindowAssociatedWithOSWindow(void *osWindow); + GHOST_IWindow *getWindowAssociatedWithOSWindow(void *osWindow); /** * Return true if any windows has a modified status diff --git a/intern/ghost/intern/GHOST_WindowNULL.h b/intern/ghost/intern/GHOST_WindowNULL.h index 0cdb161f40d..80a1274a2a9 100644 --- a/intern/ghost/intern/GHOST_WindowNULL.h +++ b/intern/ghost/intern/GHOST_WindowNULL.h @@ -96,7 +96,7 @@ private: * \param type The type of rendering context create. * \return Indication of success. */ - virtual GHOST_Context *newDrawingContext(GHOST_TDrawingContextType type) {return NULL;} + GHOST_Context *newDrawingContext(GHOST_TDrawingContextType type) {return NULL;} }; diff --git a/intern/ghost/intern/GHOST_WindowSDL.h b/intern/ghost/intern/GHOST_WindowSDL.h index d446c220c2e..5f658e8ad01 100644 --- a/intern/ghost/intern/GHOST_WindowSDL.h +++ b/intern/ghost/intern/GHOST_WindowSDL.h @@ -105,7 +105,7 @@ protected: * \param type The type of rendering context create. * \return Indication of success. */ - virtual GHOST_Context *newDrawingContext(GHOST_TDrawingContextType type); + GHOST_Context *newDrawingContext(GHOST_TDrawingContextType type); GHOST_TSuccess setWindowCursorGrab(GHOST_TGrabCursorMode mode); diff --git a/intern/ghost/intern/GHOST_WindowWin32.h b/intern/ghost/intern/GHOST_WindowWin32.h index c4575d0f9b0..fd8c0c2e9ac 100644 --- a/intern/ghost/intern/GHOST_WindowWin32.h +++ b/intern/ghost/intern/GHOST_WindowWin32.h @@ -98,70 +98,70 @@ public: * Destructor. * Closes the window and disposes resources allocated. */ - virtual ~GHOST_WindowWin32(); + ~GHOST_WindowWin32(); /** * Returns indication as to whether the window is valid. * \return The validity of the window. */ - virtual bool getValid() const; + bool getValid() const; /** * Access to the handle of the window. * \return The handle of the window. */ - virtual HWND getHWND() const; + HWND getHWND() const; /** * Sets the title displayed in the title bar. * \param title The title to display in the title bar. */ - virtual void setTitle(const STR_String& title); + void setTitle(const STR_String& title); /** * Returns the title displayed in the title bar. * \param title The title displayed in the title bar. */ - virtual void getTitle(STR_String& title) const; + void getTitle(STR_String& title) const; /** * Returns the window rectangle dimensions. * The dimensions are given in screen coordinates that are relative to the upper-left corner of the screen. * \param bounds The bounding rectangle of the window. */ - virtual void getWindowBounds(GHOST_Rect& bounds) const; + void getWindowBounds(GHOST_Rect& bounds) const; /** * Returns the client rectangle dimensions. * The left and top members of the rectangle are always zero. * \param bounds The bounding rectangle of the client area of the window. */ - virtual void getClientBounds(GHOST_Rect& bounds) const; + void getClientBounds(GHOST_Rect& bounds) const; /** * Resizes client rectangle width. * \param width The new width of the client area of the window. */ - virtual GHOST_TSuccess setClientWidth(GHOST_TUns32 width); + GHOST_TSuccess setClientWidth(GHOST_TUns32 width); /** * Resizes client rectangle height. * \param height The new height of the client area of the window. */ - virtual GHOST_TSuccess setClientHeight(GHOST_TUns32 height); + GHOST_TSuccess setClientHeight(GHOST_TUns32 height); /** * Resizes client rectangle. * \param width The new width of the client area of the window. * \param height The new height of the client area of the window. */ - virtual GHOST_TSuccess setClientSize(GHOST_TUns32 width, GHOST_TUns32 height); + GHOST_TSuccess setClientSize(GHOST_TUns32 width, GHOST_TUns32 height); /** * Returns the state of the window (normal, minimized, maximized). * \return The state of the window. */ - virtual GHOST_TWindowState getState() const; + GHOST_TWindowState getState() const; /** * Converts a point in screen coordinates to client rectangle coordinates @@ -170,7 +170,7 @@ public: * \param outX The x-coordinate in the client rectangle. * \param outY The y-coordinate in the client rectangle. */ - virtual void screenToClient(GHOST_TInt32 inX, GHOST_TInt32 inY, GHOST_TInt32& outX, GHOST_TInt32& outY) const; + void screenToClient(GHOST_TInt32 inX, GHOST_TInt32 inY, GHOST_TInt32& outX, GHOST_TInt32& outY) const; /** * Converts a point in screen coordinates to client rectangle coordinates @@ -179,39 +179,39 @@ public: * \param outX The x-coordinate on the screen. * \param outY The y-coordinate on the screen. */ - virtual void clientToScreen(GHOST_TInt32 inX, GHOST_TInt32 inY, GHOST_TInt32& outX, GHOST_TInt32& outY) const; + void clientToScreen(GHOST_TInt32 inX, GHOST_TInt32 inY, GHOST_TInt32& outX, GHOST_TInt32& outY) const; /** * Sets the state of the window (normal, minimized, maximized). * \param state The state of the window. * \return Indication of success. */ - virtual GHOST_TSuccess setState(GHOST_TWindowState state); + GHOST_TSuccess setState(GHOST_TWindowState state); /** * Sets the order of the window (bottom, top). * \param order The order of the window. * \return Indication of success. */ - virtual GHOST_TSuccess setOrder(GHOST_TWindowOrder order); + GHOST_TSuccess setOrder(GHOST_TWindowOrder order); /** /** * Invalidates the contents of this window. */ - virtual GHOST_TSuccess invalidate(); + GHOST_TSuccess invalidate(); /** * Sets the progress bar value displayed in the window/application icon * \param progress The progress % */ - virtual GHOST_TSuccess setProgressBar(float progress); + GHOST_TSuccess setProgressBar(float progress); /** * Hides the progress bar in the icon */ - virtual GHOST_TSuccess endProgressBar(); + GHOST_TSuccess endProgressBar(); /** @@ -259,12 +259,12 @@ public: #ifdef WITH_INPUT_IME GHOST_ImeWin32 *getImeInput() {return &m_imeImput;} - virtual void beginIME( + void beginIME( GHOST_TInt32 x, GHOST_TInt32 y, GHOST_TInt32 w, GHOST_TInt32 h, int completed); - virtual void endIME(); + void endIME(); #endif /* WITH_INPUT_IME */ private: @@ -273,36 +273,36 @@ private: * \param type The type of rendering context create. * \return Indication of success. */ - virtual GHOST_Context *newDrawingContext(GHOST_TDrawingContextType type); + GHOST_Context *newDrawingContext(GHOST_TDrawingContextType type); /** * Sets the cursor visibility on the window using * native window system calls. */ - virtual GHOST_TSuccess setWindowCursorVisibility(bool visible); + GHOST_TSuccess setWindowCursorVisibility(bool visible); /** * Sets the cursor grab on the window using native window system calls. * Using registerMouseClickEvent. * \param mode GHOST_TGrabCursorMode. */ - virtual GHOST_TSuccess setWindowCursorGrab(GHOST_TGrabCursorMode mode); + GHOST_TSuccess setWindowCursorGrab(GHOST_TGrabCursorMode mode); /** * Sets the cursor shape on the window using * native window system calls. */ - virtual GHOST_TSuccess setWindowCursorShape(GHOST_TStandardCursor shape); + GHOST_TSuccess setWindowCursorShape(GHOST_TStandardCursor shape); /** * Sets the cursor shape on the window using * native window system calls. */ - virtual GHOST_TSuccess setWindowCustomCursorShape(GHOST_TUns8 bitmap[16][2], + GHOST_TSuccess setWindowCustomCursorShape(GHOST_TUns8 bitmap[16][2], GHOST_TUns8 mask[16][2], int hotX, int hotY); - virtual GHOST_TSuccess setWindowCustomCursorShape( + GHOST_TSuccess setWindowCustomCursorShape( GHOST_TUns8 *bitmap, GHOST_TUns8 *mask, int sizex, diff --git a/intern/ghost/intern/GHOST_WindowX11.h b/intern/ghost/intern/GHOST_WindowX11.h index 7bb9a858882..eaa8a5327f7 100644 --- a/intern/ghost/intern/GHOST_WindowX11.h +++ b/intern/ghost/intern/GHOST_WindowX11.h @@ -233,7 +233,7 @@ protected: * \param type The type of rendering context create. * \return Indication of success. */ - virtual GHOST_Context *newDrawingContext(GHOST_TDrawingContextType type); + GHOST_Context *newDrawingContext(GHOST_TDrawingContextType type); /** * Sets the cursor visibility on the window using |