Quick and dirty fix for building with COMPATIBILITY_2_4 off.

[wxWidgets.git] / include / wx / apptrait.h

diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h
index d49e549ca34056b62ac60434e7a455c4ccdb8b5b..1522cea227629d2398feb60e8452f1446c9da1d6 100644 (file)
--- a/include/wx/apptrait.h
+++ b/include/wx/apptrait.h
@@ -12,6 +12,7 @@
 #ifndef _WX_APPTRAIT_H_
 #define _WX_APPTRAIT_H_
 
+class WXDLLEXPORT wxObject;
 class WXDLLEXPORT wxAppTraits;
 #if wxUSE_FONTMAP
     class WXDLLEXPORT wxFontMapper;
@@ -81,6 +82,15 @@ public:
     // remove this object from the pending delete list in GUI, do nothing in
     // wxBase
     virtual void RemoveFromPendingDelete(wxObject *object) = 0;
+
+
+    // other miscellaneous helpers
+    // ---------------------------
+
+    // wxGetOsVersion() behaves differently in GUI and non-GUI builds under
+    // Unix: in the former case it returns the information about the toolkit
+    // and in the latter -- about the OS, so we need to virtualize it
+    virtual int GetOSVersion(int *verMaj, int *verMin) = 0;
 };
 
 // ----------------------------------------------------------------------------
@@ -89,7 +99,9 @@ public:
 
 #if defined(__WXMSW__)
     #include "wx/msw/apptbase.h"
-#else
+#elif defined(__UNIX__)
+    #include "wx/unix/apptbase.h"
+#else // no platform-specific methods to add to wxAppTraits
     typedef 
     // wxAppTraits must be a class because it was forward declared as class
     class WXDLLEXPORT wxAppTraits : public wxAppTraitsBase
@@ -105,7 +117,7 @@ public:
 // wxConsoleAppTraitsBase: wxAppTraits implementation for the console apps
 // ----------------------------------------------------------------------------
 
-class wxConsoleAppTraitsBase : public wxAppTraits
+class WXDLLEXPORT wxConsoleAppTraitsBase : public wxAppTraits
 {
 public:
 #if wxUSE_LOG
@@ -131,7 +143,7 @@ public:
 
 #if wxUSE_GUI
 
-class wxGUIAppTraitsBase : public wxAppTraits
+class WXDLLEXPORT wxGUIAppTraitsBase : public wxAppTraits
 {
 public:
 #if wxUSE_LOG