apptraits in line for carbon and mach-o

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

diff --git a/include/wx/mac/apptbase.h b/include/wx/mac/apptbase.h
index 8c411d0f1e65b85ea8d35a762e76d6e05fef8420..84c68cd0eef1b551b5ac23b4d57d214a9d101311 100644 (file)
--- a/include/wx/mac/apptbase.h
+++ b/include/wx/mac/apptbase.h
@@ -33,9 +33,6 @@ public:
     // other miscellaneous helpers
     // ---------------------------
 
-    // under Mac this function does the same thing for console and GUI
-    // applications so we can implement it directly in the base class
-    virtual int GetOSVersion(int *verMaj, int *verMin);
 };
 
 #endif // _WX_MAC_APPTBASE_H_

diff --git a/include/wx/mac/apptrait.h b/include/wx/mac/apptrait.h
index bb133cca3ade76bde1f3164f4f397afc5a69c761..e6d6bdfed9c55fda39e1fc8c040fbce08cf8186b 100644 (file)
--- a/include/wx/mac/apptrait.h
+++ b/include/wx/mac/apptrait.h
@@ -19,6 +19,10 @@
 class WXDLLEXPORT wxConsoleAppTraits : public wxConsoleAppTraitsBase
 {
 public:
+    // other miscellaneous helpers
+    // ---------------------------
+
+    virtual int GetOSVersion(int *verMaj, int *verMin);
 };
 
 #if wxUSE_GUI
@@ -26,6 +30,10 @@ public:
 class WXDLLEXPORT wxGUIAppTraits : public wxGUIAppTraitsBase
 {
 public:
+    // other miscellaneous helpers
+    // ---------------------------
+
+    virtual int GetOSVersion(int *verMaj, int *verMin);
 };
 
 #endif // wxUSE_GUI