diff options
Diffstat (limited to 'intern/ghost/intern/GHOST_Window.h')
-rw-r--r-- | intern/ghost/intern/GHOST_Window.h | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/intern/ghost/intern/GHOST_Window.h b/intern/ghost/intern/GHOST_Window.h index 2798bdf72f3..413a3315225 100644 --- a/intern/ghost/intern/GHOST_Window.h +++ b/intern/ghost/intern/GHOST_Window.h @@ -40,7 +40,7 @@ class GHOST_Context; /** * Platform independent implementation of GHOST_IWindow. - * Dimensions are given in screen coordinates that are relative to the + * Dimensions are given in screen coordinates that are relative to the * upper-left corner of the screen. * Implements part of the GHOST_IWindow interface and adds some methods to * be implemented by childs of this class. @@ -94,7 +94,7 @@ public: * virtual GHOST_TSuccess activateDrawingContext() = 0; * virtual GHOST_TSuccess invalidate() = 0; */ - + /** * Destructor. * Closes the window and disposes resources allocated. @@ -105,7 +105,7 @@ public: * Returns indication as to whether the window is valid. * \return The validity of the window. */ - virtual bool getValid() const { + virtual bool getValid() const { return m_context != NULL; } @@ -114,7 +114,7 @@ public: * \return The associated OS object/handle */ virtual void *getOSWindow() const; - + /** * Returns the current cursor shape. * \return The current cursor shape. @@ -185,14 +185,14 @@ public: virtual GHOST_TSuccess setProgressBar(float /*progress*/) { return GHOST_kFailure; } - + /** * Hides the progress bar in the icon */ virtual GHOST_TSuccess endProgressBar() { return GHOST_kFailure; } - + /** * Sets the swap interval for swapBuffers. * \param interval The swap interval to use. @@ -216,26 +216,26 @@ public: * Tells if the ongoing drag'n'drop object can be accepted upon mouse drop */ void setAcceptDragOperation(bool canAccept); - + /** * Returns acceptance of the dropped object * Usually called by the "object dropped" event handling function */ bool canAcceptDragOperation() 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); - + /** * Gets the window "modified" status, indicating unsaved changes * \return True if there are unsaved changes */ virtual bool getModifiedState(); - + /** * Returns the type of drawing context used in this window. * \return The current type of drawing context. @@ -278,7 +278,7 @@ public: { return m_userData; } - + /** * Changes the window user data. * \param userData: The window user data. @@ -287,7 +287,7 @@ public: { m_userData = userData; } - + float getNativePixelSize(void) { if (m_nativePixelSize > 0.0f) @@ -341,7 +341,7 @@ protected: virtual GHOST_TSuccess setWindowCursorGrab(GHOST_TGrabCursorMode /*mode*/) { return GHOST_kSuccess; } - + /** * Sets the cursor shape on the window using * native window system calls. @@ -355,15 +355,15 @@ protected: virtual GHOST_TSuccess setWindowCustomCursorShape(GHOST_TUns8 bitmap[16][2], GHOST_TUns8 mask[16][2], int hotX, int hotY) = 0; - - virtual GHOST_TSuccess setWindowCustomCursorShape(GHOST_TUns8 *bitmap, GHOST_TUns8 *mask, + + virtual GHOST_TSuccess setWindowCustomCursorShape(GHOST_TUns8 *bitmap, GHOST_TUns8 *mask, int szx, int szy, int hotX, int hotY, int fg, int bg) = 0; GHOST_TSuccess releaseNativeHandles(); /** The drawing context installed in this window. */ GHOST_TDrawingContextType m_drawingContextType; - + /** The window user data */ GHOST_TUserDataPtr m_userData; @@ -384,16 +384,16 @@ protected: /** The current shape of the cursor */ GHOST_TStandardCursor m_cursorShape; - + /** The presence of progress indicator with the application icon */ bool m_progressBarVisible; - + /** The acceptance of the "drop candidate" of the current drag'n'drop operation */ bool m_canAcceptDragOperation; - + /** Modified state : are there unsaved changes */ bool m_isUnsavedChanges; - + /** Stores whether this is a full screen window. */ bool m_fullScreen; @@ -407,7 +407,7 @@ protected: GHOST_TUns32 m_fullScreenWidth; /** Full-screen height */ GHOST_TUns32 m_fullScreenHeight; - + /* OSX only, retina screens */ float m_nativePixelSize; |