[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34340] branches/merwin-tablet/intern/ ghost/intern/GHOST_WindowCocoa.mm: finished renaming a member variable from earlier commit

Mike Erwin significant.bit at gmail.com
Sat Jan 15 22:55:33 CET 2011


Revision: 34340
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34340
Author:   merwin
Date:     2011-01-15 21:55:32 +0000 (Sat, 15 Jan 2011)
Log Message:
-----------
finished renaming a member variable from earlier commit

Modified Paths:
--------------
    branches/merwin-tablet/intern/ghost/intern/GHOST_WindowCocoa.mm

Modified: branches/merwin-tablet/intern/ghost/intern/GHOST_WindowCocoa.mm
===================================================================
--- branches/merwin-tablet/intern/ghost/intern/GHOST_WindowCocoa.mm	2011-01-15 20:35:31 UTC (rev 34339)
+++ branches/merwin-tablet/intern/ghost/intern/GHOST_WindowCocoa.mm	2011-01-15 21:55:32 UTC (rev 34340)
@@ -322,7 +322,7 @@
 	NSOpenGLPixelFormat *pixelFormat = nil;
 	int i;
 		
-	m_systemCocoa = systemCocoa;
+	m_ghostSystem = systemCocoa;
 	m_fullScreen = false;
 	
 	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
@@ -797,7 +797,7 @@
 #endif
 			
 				//Tell WM of view new size
-				m_systemCocoa->handleWindowEvent(GHOST_kEventWindowSize, this);
+				m_ghostSystem->handleWindowEvent(GHOST_kEventWindowSize, this);
 				
 				[pool drain];
 				}
@@ -860,7 +860,7 @@
 #endif
 			
 				//Tell WM of view new size
-				m_systemCocoa->handleWindowEvent(GHOST_kEventWindowSize, this);
+				m_ghostSystem->handleWindowEvent(GHOST_kEventWindowSize, this);
 			}
             else if ([m_window isMiniaturized])
 				[m_window deminiaturize:nil];
@@ -1204,7 +1204,7 @@
 			GHOST_TInt32 x_old,y_old;
 			NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 
-			m_systemCocoa->getCursorPosition(x_old,y_old);
+			m_ghostSystem->getCursorPosition(x_old,y_old);
 			screenToClient(x_old, y_old, m_cursorGrabInitPos[0], m_cursorGrabInitPos[1]);
 			//Warp position is stored in client (window base) coordinates
 			setCursorGrabAccum(0, 0);




More information about the Bf-blender-cvs mailing list