Cleaned up remains of outdated 3D effect handling.

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

diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h
index f6750d2bc4233cc963bf14eff3a0a161289f8eba..1f3e30f3b7976d7c39715d59bf2ac94dd2d8dad3 100644 (file)
--- a/include/wx/apptrait.h
+++ b/include/wx/apptrait.h
@@ -24,7 +24,10 @@ class WXDLLIMPEXP_BASE wxMessageOutput;
 class WXDLLEXPORT wxRendererNative;
 class WXDLLIMPEXP_BASE wxString;
 
-extern "C" struct GSocketGUIFunctionsTable;
+extern "C"
+{
+    struct GSocketGUIFunctionsTable;
+}
 
 // ----------------------------------------------------------------------------
 // toolkit information
@@ -131,7 +134,7 @@ public:
 //     Unix code (and otherwise __UNIX__ wouldn't be defined)
 #if defined(__WXMSW__)
     #include "wx/msw/apptbase.h"
-#elif defined(__UNIX__)
+#elif defined(__UNIX__) && !defined(__EMX__)
     #include "wx/unix/apptbase.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/apptbase.h"
@@ -212,15 +215,22 @@ public:
 
 #if defined(__WXMSW__)
     #include "wx/msw/apptrait.h"
-#elif defined(__UNIX__)
+#elif defined(__UNIX__) && !defined(__EMX__)
     #include "wx/unix/apptrait.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/apptrait.h"
-#else // no platform-specific methods to add to wxAppTraits
+#else 
+    // at least, we need an implementation of GetToolkitInfo !
     #if wxUSE_GUI
-        typedef wxGUIAppTraitsBase wxGUIAppTraits;
+        class wxGUIAppTraits : public wxGUIAppTraitsBase
+        {
+            virtual wxToolkitInfo& GetToolkitInfo();
+        };
     #endif // wxUSE_GUI
-    typedef wxConsoleAppTraitsBase wxConsoleAppTraits;
+    class wxConsoleAppTraits: public wxConsoleAppTraitsBase 
+    {
+        virtual wxToolkitInfo& GetToolkitInfo();
+    };
 #endif // platform
 
 #endif // _WX_APPTRAIT_H_