X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7af1b53999ef37f99805e05df68c4d635fa4dbf8..421a84317fc3d53ac4fd64613f1af2d19018efc5:/include/wx/apptrait.h?ds=sidebyside

diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h
index ee9501af6b..edce5bb945 100644
--- a/include/wx/apptrait.h
+++ b/include/wx/apptrait.h
@@ -19,6 +19,7 @@ class WXDLLEXPORT wxAppTraits;
 #endif // wxUSE_FONTMAP
 class WXDLLEXPORT wxLog;
 class WXDLLEXPORT wxMessageOutput;
+class WXDLLEXPORT wxString;
 
 // ----------------------------------------------------------------------------
 // wxAppTraits: this class defines various configurable aspects of wxApp
@@ -27,14 +28,6 @@ class WXDLLEXPORT wxMessageOutput;
 class WXDLLIMPEXP_BASE wxAppTraitsBase
 {
 public:
-    // wxAppTraits is an ABC, but we also provide 2 standard implementations of
-    // it, one for the console apps and the other for the GUI ones
-    static wxAppTraits *CreateConsole();
-#if wxUSE_GUI
-    static wxAppTraits *CreateGUI();
-#endif // wxUSE_GUI
-
-
     // hooks for creating the global objects, may be overridden by the user
     // ------------------------------------------------------------------------
 
@@ -97,14 +90,17 @@ 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(__UNIX__)
     #include "wx/unix/apptbase.h"
+#elif defined(__WXMAC__)
+    #include "wx/mac/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
+    class WXDLLIMPEXP_BASE wxAppTraits : public wxAppTraitsBase
     {
     };
 #endif // platform
@@ -173,6 +169,8 @@ public:
     #include "wx/msw/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;