diff options
author | Jens Verwiebe <info@jensverwiebe.de> | 2013-09-29 14:00:34 +0400 |
---|---|---|
committer | Jens Verwiebe <info@jensverwiebe.de> | 2013-09-29 14:00:34 +0400 |
commit | 20053f495477f1df40ae2c0fed7159322d4df666 (patch) | |
tree | 35792d2573318f6bd66d70bc4592352d0ef48bab /intern/ghost | |
parent | 8fa068d30ab2981673797ab89ba9a15f08e11a9e (diff) |
OSX: cleanup for 60409, let m_window protected and use rather a public function for getting it public
Diffstat (limited to 'intern/ghost')
-rw-r--r-- | intern/ghost/intern/GHOST_SystemCocoa.mm | 2 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_WindowCocoa.h | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm index c5d906d6073..588570c701b 100644 --- a/intern/ghost/intern/GHOST_SystemCocoa.mm +++ b/intern/ghost/intern/GHOST_SystemCocoa.mm @@ -1026,7 +1026,7 @@ GHOST_TSuccess GHOST_SystemCocoa::handleWindowEvent(GHOST_TEventType eventType, switch (eventType) { case GHOST_kEventWindowClose: // make sure index 1 exists and compare window adress - if ([windowsList count] > 1 && (window->m_window != [windowsList objectAtIndex:1])) { + if ([windowsList count] > 1 && (window->get_m_window() != [windowsList objectAtIndex:1])) { pushEvent( new GHOST_Event(getMilliSeconds(), GHOST_kEventWindowClose, window) ); } else { diff --git a/intern/ghost/intern/GHOST_WindowCocoa.h b/intern/ghost/intern/GHOST_WindowCocoa.h index af8aa4b0062..6787d007ac7 100644 --- a/intern/ghost/intern/GHOST_WindowCocoa.h +++ b/intern/ghost/intern/GHOST_WindowCocoa.h @@ -270,9 +270,8 @@ public: GHOST_TSuccess endFullScreen() const {return GHOST_kFailure;} - /** The window containing the OpenGL view */ - CocoaWindow *m_window; - + /** public function to get the window containing the OpenGL view */ + CocoaWindow *get_m_window() const {return m_window;}; protected: /** @@ -321,8 +320,8 @@ protected: virtual 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; + /** The window containing the OpenGL view */ + CocoaWindow *m_window; /** The openGL view */ CocoaOpenGLView *m_openGLView; |