fixed build

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

diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h
index 6fa87d9e25771726aa14d30dc81ebb56d4a8ef40..edce5bb94515797d1b8c892fa02e9499ca130958 100644 (file)
--- a/include/wx/apptrait.h
+++ b/include/wx/apptrait.h
@@ -90,12 +90,14 @@ public:
 // include the platform-specific version of the class
 // ----------------------------------------------------------------------------
 
+// NB: test for __UNIX__ before __WXMAC__ as under Darwin we want to use the
+//     Unix code (and otherwise __UNIX__ wouldn't be defined)
 #if defined(__WXMSW__)
     #include "wx/msw/apptbase.h"
-#elif defined(__WXMAC__)
-    #include "wx/mac/apptbase.h"
 #elif defined(__UNIX__)
     #include "wx/unix/apptbase.h"
+#elif defined(__WXMAC__)
+    #include "wx/mac/apptbase.h"
 #else // no platform-specific methods to add to wxAppTraits
     // wxAppTraits must be a class because it was forward declared as class
     class WXDLLIMPEXP_BASE wxAppTraits : public wxAppTraitsBase
@@ -165,10 +167,10 @@ public:
 
 #if defined(__WXMSW__)
     #include "wx/msw/apptrait.h"
-#elif defined(__WXMAC__)
-    #include "wx/mac/apptrait.h"
 #elif defined(__UNIX__)
     #include "wx/unix/apptrait.h"
+#elif defined(__WXMAC__)
+    #include "wx/mac/apptrait.h"
 #else // no platform-specific methods to add to wxAppTraits
     #if wxUSE_GUI
         typedef wxGUIAppTraitsBase wxGUIAppTraits;

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index 7198e49b52cc97b77d7095b7b4c76feaacf2ca07..ae2d5b4140a04fedf438299fb7ec8126417d9274 100644 (file)
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -197,7 +197,8 @@ void wxBell()
     SysBeep(30);
 }
 
-int wxAppTraits::GetOSVersion(int *majorVsn, int *minorVsn)
+// our OS version is the same in non GUI and GUI cases
+static int DoGetOSVersion(int *majorVsn, int *minorVsn)
 {
     long theSystem ;
 
@@ -217,10 +218,20 @@ int wxAppTraits::GetOSVersion(int *majorVsn, int *minorVsn)
 #endif
 }
 
+int wxConsoleAppTraits::GetOSVersion(int *majorVsn, int *minorVsn)
+{
+    return DoGetOSVersion(majorVsn, minorVsn);
+}
+
 #endif // wxUSE_BASE
 
 #if wxUSE_GUI
 
+int wxGUIAppTraits::GetOSVersion(int *majorVsn, int *minorVsn)
+{
+    return DoGetOSVersion(majorVsn, minorVsn);
+}
+
 // Reading and writing resources (eg WIN.INI, .Xdefaults)
 #if wxUSE_RESOURCES
 bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file)

diff --git a/src/mac/utils.cpp b/src/mac/utils.cpp
index 7198e49b52cc97b77d7095b7b4c76feaacf2ca07..ae2d5b4140a04fedf438299fb7ec8126417d9274 100644 (file)
--- a/src/mac/utils.cpp
+++ b/src/mac/utils.cpp
@@ -197,7 +197,8 @@ void wxBell()
     SysBeep(30);
 }
 
-int wxAppTraits::GetOSVersion(int *majorVsn, int *minorVsn)
+// our OS version is the same in non GUI and GUI cases
+static int DoGetOSVersion(int *majorVsn, int *minorVsn)
 {
     long theSystem ;
 
@@ -217,10 +218,20 @@ int wxAppTraits::GetOSVersion(int *majorVsn, int *minorVsn)
 #endif
 }
 
+int wxConsoleAppTraits::GetOSVersion(int *majorVsn, int *minorVsn)
+{
+    return DoGetOSVersion(majorVsn, minorVsn);
+}
+
 #endif // wxUSE_BASE
 
 #if wxUSE_GUI
 
+int wxGUIAppTraits::GetOSVersion(int *majorVsn, int *minorVsn)
+{
+    return DoGetOSVersion(majorVsn, minorVsn);
+}
+
 // Reading and writing resources (eg WIN.INI, .Xdefaults)
 #if wxUSE_RESOURCES
 bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file)

diff --git a/src/unix/baseunix.cpp b/src/unix/baseunix.cpp
index 99a1bdcd3e8865ce636a921e5c60021ecbe41da6..b265339a06d00621b0ceea033b37d4e9b15fd36c 100644 (file)
--- a/src/unix/baseunix.cpp
+++ b/src/unix/baseunix.cpp
@@ -85,10 +85,8 @@ wxConsoleAppTraits::WaitForChild(wxExecuteData& execData)
 // misc other stuff
 // ----------------------------------------------------------------------------
 
-// WXWIN_OS_DESCRIPTION is normally defined by configure
-#if defined( __MWERKS__ ) && defined(__MACH__)
-    #define WXWIN_OS_DESCRIPTION "MacOS X"
-#endif
+// this is in mac/utils.cpp under Mac
+#ifndef __WXMAC__
 
 int wxConsoleAppTraits::GetOSVersion(int *verMaj, int *verMin)
 {
@@ -110,3 +108,5 @@ int wxConsoleAppTraits::GetOSVersion(int *verMaj, int *verMin)
     return wxUNIX;
 }
 
+#endif // __WXMAC__
+