wxGetOsVersion() compilation andl inking fixes for wxMac

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

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
 
 #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
 
 // 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;
 {
     long theSystem;

-
-    // are there x-platform conventions ?
-

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

-    if (minorVsn != NULL)
-        *minorVsn = (theSystem & 0xFF);

 
 

-    if (majorVsn != NULL)
+    if ( majorVsn != NULL )

         *majorVsn = (theSystem >> 8);
 
         *majorVsn = (theSystem >> 8);
 

+    if ( minorVsn != NULL )
+        *minorVsn = (theSystem & 0xFF);
+

 #if defined( __DARWIN__ )
     return wxOS_MAC_OSX_DARWIN;
 #else
 #if defined( __DARWIN__ )
     return wxOS_MAC_OSX_DARWIN;
 #else


@@ -92,10 +88,6 @@ wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin)
 #endif
 }
 
 #endif
 }
 

-
-
-#if wxUSE_BASE
-

 // ----------------------------------------------------------------------------
 // debugging support
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // debugging support
 // ----------------------------------------------------------------------------

diff --git a/src/mac/classic/utils.cpp b/src/mac/classic/utils.cpp
index f28c2042f691397d336007de07435cc77a541828..a14b39d556f081280baec9a241991b05f47cb874 100644 (file)
--- a/src/mac/classic/utils.cpp
+++ b/src/mac/classic/utils.cpp
@@ -56,23 +56,20 @@
     #include <wtime.h>
 #endif
 
     #include <wtime.h>
 #endif
 

-// ---------------------------------------------------------------------------
-// code used in both base and GUI compilation
-// ---------------------------------------------------------------------------
+#if wxUSE_BASE

 
 // our OS version is the same in non GUI and GUI cases
 
 // 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;
 {
     long theSystem;

+    Gestalt(gestaltSystemVersion, &theSystem);

 
 

-    // are there x-platform conventions ?
+    if ( majorVsn != NULL )
+        *majorVsn = (theSystem >> 8);

 
 

-    Gestalt(gestaltSystemVersion, &theSystem);
-    if (minorVsn != NULL)
+    if ( minorVsn != NULL )

         *minorVsn = (theSystem & 0xFF);
 
         *minorVsn = (theSystem & 0xFF);
 

-    if (majorVsn != NULL)
-        *majorVsn = (theSystem >> 8);

 
 #if defined( __DARWIN__ )
     return wxOS_MAC_OSX_DARWIN;
 
 #if defined( __DARWIN__ )
     return wxOS_MAC_OSX_DARWIN;


@@ -81,8 +78,6 @@ wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin)
 #endif
 }
 
 #endif
 }
 

-#if wxUSE_BASE
-

 #ifndef __DARWIN__
 // defined in unix/utilsunx.cpp for Mac OS X
 
 #ifndef __DARWIN__
 // defined in unix/utilsunx.cpp for Mac OS X
 

diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index d14a33a5e6d73ac877a52dc06ef16b086889b368..d5b98d59affca7e9745e1f87a5b9241813b60bfe 100644 (file)
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -891,6 +891,23 @@ bool wxGetUserName(wxChar *buf, int sz)
     return false;
 }
 
     return false;
 }
 

+bool wxIsPlatform64Bit()
+{
+    wxString machine = wxGetCommandOutput(wxT("uname -m"));
+
+    // NOTE: these tests are not 100% reliable!
+    return machine.Contains(wxT("AMD64")) ||
+           machine.Contains(wxT("IA64")) ||
+           machine.Contains(wxT("x64")) ||
+           machine.Contains(wxT("X64")) ||
+           machine.Contains(wxT("alpha")) ||
+           machine.Contains(wxT("hppa64")) ||
+           machine.Contains(wxT("ppc64"));
+}
+
+// these functions are in mac/utils.cpp for wxMac
+#ifndef __WXMAC__
+

 wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin)
 {
     // get OS version
 wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin)
 {
     // get OS version


@@ -919,23 +936,6 @@ wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin)
     return wxPlatformInfo::GetOperatingSystemId(kernel);
 }
 
     return wxPlatformInfo::GetOperatingSystemId(kernel);
 }
 

-bool wxIsPlatform64Bit()
-{
-    wxString machine = wxGetCommandOutput(wxT("uname -m"));
-
-    // NOTE: these tests are not 100% reliable!
-    return machine.Contains(wxT("AMD64")) ||
-           machine.Contains(wxT("IA64")) ||
-           machine.Contains(wxT("x64")) ||
-           machine.Contains(wxT("X64")) ||
-           machine.Contains(wxT("alpha")) ||
-           machine.Contains(wxT("hppa64")) ||
-           machine.Contains(wxT("ppc64"));
-}
-
-// this function is in mac/utils.cpp for wxMac
-#ifndef __WXMAC__
-

 wxString wxGetOsDescription()
 {
     return wxGetCommandOutput(wxT("uname -s -r -m"));
 wxString wxGetOsDescription()
 {
     return wxGetCommandOutput(wxT("uname -s -r -m"));