X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ec6ac3eb94ee1b59a945b01bcb18090ec92afca7..f9133b32002a600cb48dd05fbcce1ab3ed684dba:/include/wx/apptrait.h

diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h
index 8cd8cd4797..6fa87d9e25 100644
--- a/include/wx/apptrait.h
+++ b/include/wx/apptrait.h
@@ -19,26 +19,15 @@ class WXDLLEXPORT wxAppTraits;
 #endif // wxUSE_FONTMAP
 class WXDLLEXPORT wxLog;
 class WXDLLEXPORT wxMessageOutput;
+class WXDLLEXPORT wxString;
 
 // ----------------------------------------------------------------------------
 // wxAppTraits: this class defines various configurable aspects of wxApp
 // ----------------------------------------------------------------------------
 
-#if wxUSE_BASE
 class WXDLLIMPEXP_BASE wxAppTraitsBase
-#else
-class WXDLLIMPEXP_CORE wxAppTraitsBase
-#endif
 {
 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
     // ------------------------------------------------------------------------
 
@@ -103,12 +92,13 @@ public:
 
 #if defined(__WXMSW__)
     #include "wx/msw/apptbase.h"
+#elif defined(__WXMAC__)
+    #include "wx/mac/apptbase.h"
 #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
+    class WXDLLIMPEXP_BASE wxAppTraits : public wxAppTraitsBase
     {
     };
 #endif // platform
@@ -175,6 +165,8 @@ public:
 
 #if defined(__WXMSW__)
     #include "wx/msw/apptrait.h"
+#elif defined(__WXMAC__)
+    #include "wx/mac/apptrait.h"
 #elif defined(__UNIX__)
     #include "wx/unix/apptrait.h"
 #else // no platform-specific methods to add to wxAppTraits