fix label

[wxWidgets.git] / src / mac / carbon / utils.cpp

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index 54913b5d00a4fbd94aa1d426600e49eb4e3ec0da..240161a190021d24a0f5e01cf9a4e10f27aabcc2 100644 (file)
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -67,24 +67,20 @@
 #endif
 #endif
 
-// ---------------------------------------------------------------------------
-// code used in both base and GUI compilation
-// ---------------------------------------------------------------------------
+#if wxUSE_BASE
 
 // our OS version is the same in non GUI and GUI cases
-wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin)
+wxOperatingSystemId wxGetOsVersion(int *majorVsn, int *minorVsn)
 {
     long theSystem;
-
-    // are there x-platform conventions ?
-
     Gestalt(gestaltSystemVersion, &theSystem);
-    if (minorVsn != NULL)
-        *minorVsn = (theSystem & 0xFF);
 
-    if (majorVsn != NULL)
+    if ( majorVsn != NULL )
         *majorVsn = (theSystem >> 8);
 
+    if ( minorVsn != NULL )
+        *minorVsn = (theSystem & 0xFF);
+
 #if defined( __DARWIN__ )
     return wxOS_MAC_OSX_DARWIN;
 #else
@@ -92,10 +88,6 @@ wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin)
 #endif
 }
 
-
-
-#if wxUSE_BASE
-
 // ----------------------------------------------------------------------------
 // debugging support
 // ----------------------------------------------------------------------------