[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60417] trunk/blender/intern/ghost/intern: OSX: cleanup for 60409, let m_window protected and use rather a public function for getting it public

[jens verwiebe]

Revision: 60417
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60417
Author:   jensverwiebe
Date:     2013-09-29 10:00:34 +0000 (Sun, 29 Sep 2013)
Log Message:
-----------
OSX: cleanup for 60409, let m_window protected and use rather a public function for getting it public

Modified Paths:
--------------
    trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
    trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.h

Modified: trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm	2013-09-29 06:47:07 UTC (rev 60416)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm	2013-09-29 10:00:34 UTC (rev 60417)
@@ -1026,7 +1026,7 @@
 		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 {

Modified: trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.h
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.h	2013-09-29 06:47:07 UTC (rev 60416)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.h	2013-09-29 10:00:34 UTC (rev 60417)
@@ -270,9 +270,8 @@
 
 	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 @@
 					
 	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;