OSX: cleanup for 60409, let m_window protected and use rather a public function for getting it public

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;