Return sensible major and minor version numbers for Mac OS X

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68506 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index 0d0b99255f51f4dae33d5b9d3cbff2c594687818..4023793277f4cf7a29e5cec0f2fb75112a5194c2 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -455,6 +455,8 @@ All (GUI):
 OSX:
 
 - Implement wxRegion::Equal() (Dr.Acula).
 OSX:
 
 - Implement wxRegion::Equal() (Dr.Acula).

+- wxGetOsVersion() now returns more sensible version numbers, e.g. 10 and 6
+  for OS X 10.6.

 
 GTK:
 
 
 GTK:
 

diff --git a/src/osx/core/utilsexc_base.cpp b/src/osx/core/utilsexc_base.cpp
index e1a8a61e0d075f8062a9749f1d2df306ad1501f6..84f8a0e3a3d5daf2fa6794a2e87b2a8f3e0d6824 100644 (file)
--- a/src/osx/core/utilsexc_base.cpp
+++ b/src/osx/core/utilsexc_base.cpp
@@ -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;
 }