Applied patch [ 1381895 ] remove circular include dependendcy in wxchar.h

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

diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h
index bfc7e17bb284f5e0b76b7ff4c448af776bc287a6..ef7686fd46eb18a3e764b815c256f33c91fa87ad 100644 (file)
--- a/include/wx/apptrait.h
+++ b/include/wx/apptrait.h
@@ -24,10 +24,7 @@ class WXDLLIMPEXP_BASE wxMessageOutput;
 class WXDLLEXPORT wxRendererNative;
 class WXDLLIMPEXP_BASE wxString;
 
-extern "C"
-{
-    struct GSocketGUIFunctionsTable;
-}
+class GSocketGUIFunctionsTable;
 
 // ----------------------------------------------------------------------------
 // toolkit information
@@ -52,9 +49,14 @@ struct WXDLLIMPEXP_BASE wxToolkitInfo
 // wxAppTraits: this class defines various configurable aspects of wxApp
 // ----------------------------------------------------------------------------
 
+class WXDLLIMPEXP_BASE wxStandardPathsBase;
+
 class WXDLLIMPEXP_BASE wxAppTraitsBase
 {
 public:
+    // needed since this class declares virtual members
+    virtual ~wxAppTraitsBase() { }
+
     // hooks for creating the global objects, may be overridden by the user
     // ------------------------------------------------------------------------
 
@@ -78,6 +80,11 @@ public:
     // NB: returned pointer will be deleted by the caller
     virtual wxRendererNative *CreateRenderer() = 0;
 
+#if wxUSE_STDPATHS
+    // wxStandardPaths object is normally the same for wxBase and wxGUI
+    // except in the case of wxMac and wxCocoa
+    virtual wxStandardPathsBase& GetStandardPaths();
+#endif // wxUSE_STDPATHS
 
     // functions abstracting differences between GUI and console modes
     // ------------------------------------------------------------------------
@@ -112,7 +119,7 @@ public:
 
 #if wxUSE_SOCKETS
     // return table of GUI callbacks for GSocket code or NULL in wxBase. This
-    // is needed because networking classes are in their own library and so 
+    // is needed because networking classes are in their own library and so
     // they can't directly call GUI functions (the same net library can be
     // used in both GUI and base apps). To complicate it further, GUI library
     // ("wxCore") doesn't depend on networking library and so only a functions
@@ -135,9 +142,12 @@ 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__)
+// NB:  test for __UNIX__ before __WXMAC__ as under Darwin we want to use the
+//      Unix code (and otherwise __UNIX__ wouldn't be defined)
+// ABX: check __WIN32__ instead of __WXMSW__ for the same MSWBase in any Win32 port
+#if defined(__WXPALMOS__)
+    #include "wx/palmos/apptbase.h"
+#elif defined(__WIN32__)
     #include "wx/msw/apptbase.h"
 #elif defined(__UNIX__) && !defined(__EMX__)
     #include "wx/unix/apptbase.h"
@@ -220,7 +230,10 @@ public:
 // include the platform-specific version of the classes above
 // ----------------------------------------------------------------------------
 
-#if defined(__WXMSW__)
+// ABX: check __WIN32__ instead of __WXMSW__ for the same MSWBase in any Win32 port
+#if defined(__WXPALMOS__)
+    #include "wx/palmos/apptrait.h"
+#elif defined(__WIN32__)
     #include "wx/msw/apptrait.h"
 #elif defined(__UNIX__) && !defined(__EMX__)
     #include "wx/unix/apptrait.h"
@@ -228,7 +241,7 @@ public:
     #include "wx/mac/apptrait.h"
 #elif defined(__WXPM__)
     #include "wx/os2/apptrait.h"
-#else 
+#else
     // at least, we need an implementation of GetToolkitInfo !
     #if wxUSE_GUI
         class wxGUIAppTraits : public wxGUIAppTraitsBase
@@ -236,7 +249,7 @@ public:
             virtual wxToolkitInfo& GetToolkitInfo();
         };
     #endif // wxUSE_GUI
-    class wxConsoleAppTraits: public wxConsoleAppTraitsBase 
+    class wxConsoleAppTraits: public wxConsoleAppTraitsBase
     {
         virtual wxToolkitInfo& GetToolkitInfo();
     };