Use the data scheme to load resources in the WebKitGTK+ implementation, rather than...

[wxWidgets.git] / src / osx / core / utilsexc_base.cpp

diff --git a/src/osx/core/utilsexc_base.cpp b/src/osx/core/utilsexc_base.cpp
index bf7e95b6a5ebd67b778f568db10a8de87b7b83d2..84f8a0e3a3d5daf2fa6794a2e87b2a8f3e0d6824 100644 (file)
--- a/src/osx/core/utilsexc_base.cpp
+++ b/src/osx/core/utilsexc_base.cpp
@@ -60,7 +60,7 @@ extern bool WXDLLEXPORT wxIsDebuggerRunning()
     return false;
 }
 
     return false;
 }
 

-#if !wxUSE_GUI || wxOSX_USE_COCOA_OR_CARBON
+#if ( !wxUSE_GUI && !wxOSX_USE_IPHONE ) || wxOSX_USE_COCOA_OR_CARBON

 
 // have a fast version for mac code that returns the version as a return value
 
 
 // have a fast version for mac code that returns the version as a return value
 


@@ -77,6 +77,19 @@ long UMAGetSystemVersion()
 // our OS version is the same in non GUI and GUI cases
 wxOperatingSystemId wxGetOsVersion(int *majorVsn, int *minorVsn)
 {
 // our OS version is the same in non GUI and GUI cases
 wxOperatingSystemId wxGetOsVersion(int *majorVsn, int *minorVsn)
 {

+    // This returns 10 and 6 for OS X 10.6, consistent with behaviour on
+    // other platforms.
+    SInt32 maj, min;
+    Gestalt(gestaltSystemVersionMajor, &maj);
+    Gestalt(gestaltSystemVersionMinor, &min);
+
+    if ( majorVsn != NULL )
+        *majorVsn = maj;
+
+    if ( minorVsn != NULL )
+        *minorVsn = min;
+
+#if 0

     SInt32 theSystem;
     Gestalt(gestaltSystemVersion, &theSystem);
 
     SInt32 theSystem;
     Gestalt(gestaltSystemVersion, &theSystem);
 


@@ -85,7 +98,7 @@ wxOperatingSystemId wxGetOsVersion(int *majorVsn, int *minorVsn)
 
     if ( minorVsn != NULL )
         *minorVsn = (theSystem & 0xFF);
 
     if ( minorVsn != NULL )
         *minorVsn = (theSystem & 0xFF);

-
+#endif

     return wxOS_MAC_OSX_DARWIN;
 }
 
     return wxOS_MAC_OSX_DARWIN;
 }