Changeset 10622

Timestamp:

10/10/09 11:20:39 (4 years ago)

Author:

robert

Message:

From Bob Kuehne, "fix for 10.6/darwin: this fix changes what i believe to be a typo in the os x darwinutils file from ID to id, the proper objective-c name for a type."

Files:

• OpenSceneGraph/trunk/src/osgViewer/DarwinUtils.mm (modified) (8 diffs)

OpenSceneGraph/trunk/src/osgViewer/DarwinUtils.mm

@@ -17 +17 @@
 }
 
--(void) show: (ID) data;
--(void) hide: (ID) data;
+-(void) show: (id) data;
+-(void) hide: (id) data;
 
 @end
@@ -26 +26 @@
 
 
--(void) hide:(ID) data 
+-(void) hide:(id) data 
 {
     OSErr error = SetSystemUIMode(kUIModeAllHidden, kUIOptionAutoShowMenuBar);
@@ -35 +35 @@
 
 
--(void) show:(ID) data 
+-(void) show:(id) data 
 {
     OSErr error = SetSystemUIMode(kUIModeNormal, 0);
@@ -282 +282 @@
         resolutionList.clear();
 
-        CGDirectDisplayID displayID = getDisplayID(screenIdentifier);
-        CFArrayRef availableModes = CGDisplayAvailableModes(displayID);
+        CGDirectDisplayID displayid = getDisplayID(screenIdentifier);
+        CFArrayRef availableModes = CGDisplayAvailableModes(displayid);
         unsigned int numberOfAvailableModes = CFArrayGetCount(availableModes);
         for (unsigned int i=0; i<numberOfAvailableModes; ++i) {
@@ -327 +327 @@
 bool DarwinWindowingSystemInterface::setScreenResolutionImpl(const osg::GraphicsContext::ScreenIdentifier& screenIdentifier, unsigned int width, unsigned int height) 
 { 
-    CGDirectDisplayID displayID = getDisplayID(screenIdentifier);
+    CGDirectDisplayID displayid = getDisplayID(screenIdentifier);
     
     // add next line and on following line replace hard coded depth and refresh rate
-    CGRefreshRate refresh =  getDictDouble (CGDisplayCurrentMode(displayID), kCGDisplayRefreshRate);  
+    CGRefreshRate refresh =  getDictDouble (CGDisplayCurrentMode(displayid), kCGDisplayRefreshRate);  
     CFDictionaryRef display_mode_values =
         CGDisplayBestModeForParametersAndRefreshRate(
-                        displayID, 
-                        CGDisplayBitsPerPixel(displayID), 
+                        displayid, 
+                        CGDisplayBitsPerPixel(displayid), 
                         width, height,  
                         refresh,  
@@ -340 +340 @@
 
                                       
-    CGDisplaySwitchToMode(displayID, display_mode_values);    
+    CGDisplaySwitchToMode(displayid, display_mode_values);    
     return true; 
 }
@@ -351 +351 @@
     getScreenResolution(screenIdentifier, width, height);
     
-    CGDirectDisplayID displayID = getDisplayID(screenIdentifier);
+    CGDirectDisplayID displayid = getDisplayID(screenIdentifier);
     
     // add next line and on following line replace hard coded depth and refresh rate
     CFDictionaryRef display_mode_values =
         CGDisplayBestModeForParametersAndRefreshRate(
-                        displayID, 
-                        CGDisplayBitsPerPixel(displayID), 
+                        displayid, 
+                        CGDisplayBitsPerPixel(displayid), 
                         width, height,  
                         refreshRate,  
@@ -364 +364 @@
                                       
     if (success)
-        CGDisplaySwitchToMode(displayID, display_mode_values);    
+        CGDisplaySwitchToMode(displayid, display_mode_values);    
         
     return (success != 0);