[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53593] trunk/blender/intern/ghost/intern/ GHOST_SystemCocoa.mm: Removal of old code trying to detect trackpads.

[Ton Roosendaal]

Revision: 53593
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53593
Author:   ton
Date:     2013-01-05 18:23:05 +0000 (Sat, 05 Jan 2013)
Log Message:
-----------
Removal of old code trying to detect trackpads.

This was causing error in previous commit "wheel only worked after using trackpad once".

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

Modified: trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm	2013-01-05 17:57:17 UTC (rev 53592)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm	2013-01-05 18:23:05 UTC (rev 53593)
@@ -574,13 +574,7 @@
 	rstring = (char*)malloc( len );
 	sysctl( mib, 2, rstring, &len, NULL, 0 );
 	
-	//Hack on MacBook revision, as multitouch avail. function missing
-	//MacbookAir or MacBook version >= 5 (retina is MacBookPro10,1)
-	if (strstr(rstring,"MacBookAir") ||
-		(strstr(rstring,"MacBook") && (rstring[strlen(rstring)-3]>='5') && (rstring[strlen(rstring)-3]<='9')) ||
-		(strstr(rstring,"MacBook") && (rstring[strlen(rstring)-4]>='1') && (rstring[strlen(rstring)-4]<='9')))
-		m_hasMultiTouchTrackpad = true;
-	else m_hasMultiTouchTrackpad = false;
+	m_hasMultiTouchTrackpad = false;
 	
 	free( rstring );
 	rstring = NULL;
@@ -1576,6 +1570,8 @@
 				}
 			}
 			break;
+			
+			/* these events only happen on swiping trackpads */
 		case NSEventTypeBeginGesture:
 			m_hasMultiTouchTrackpad = 1;
 			break;
@@ -1587,7 +1583,7 @@
 			{
 				int momentum = [event momentumPhase];
 
-				/* standard scrollwheel case */
+				/* standard scrollwheel case, if no swiping happened, and no momentum (kinetic scroll) works */
 				if (!m_hasMultiTouchTrackpad && momentum == 0) {
 					GHOST_TInt32 delta;