[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60419] trunk/blender/intern/ghost/intern: name cocoa functions in keeping with convention with similar functions for other ghost classes .

Campbell Barton ideasman42 at gmail.com
Sun Sep 29 15:14:09 CEST 2013


Revision: 60419
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60419
Author:   campbellbarton
Date:     2013-09-29 13:14:09 +0000 (Sun, 29 Sep 2013)
Log Message:
-----------
name cocoa functions in keeping with convention with similar functions for other ghost classes.

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 10:11:49 UTC (rev 60418)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm	2013-09-29 13:14:09 UTC (rev 60419)
@@ -1026,7 +1026,7 @@
 		switch (eventType) {
 			case GHOST_kEventWindowClose:
 				// check for index 1 and discard close for mainwindow as it would quit blender without dialog
-				if ([windowsList count] > 1 && (window->get_m_window() != [windowsList objectAtIndex:1])) {
+				if ([windowsList count] > 1 && (window->getCocoaWindow() != [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 10:11:49 UTC (rev 60418)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.h	2013-09-29 13:14:09 UTC (rev 60419)
@@ -271,7 +271,7 @@
 	GHOST_TSuccess endFullScreen() const {return GHOST_kFailure;}
 	
 	/** public function to get the window containing the OpenGL view */
-	CocoaWindow *get_m_window() const {return m_window;};
+	CocoaWindow *getCocoaWindow() const {return m_window;};
 	
 protected:
 	/**




More information about the Bf-blender-cvs mailing list