Added minimal file dialog for SmartPhone

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

diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h
index 488645e1b1315592989b6d0f55ed73c4d706abdc..edce5bb94515797d1b8c892fa02e9499ca130958 100644 (file)
--- a/include/wx/apptrait.h
+++ b/include/wx/apptrait.h
@@ -12,28 +12,22 @@
 #ifndef _WX_APPTRAIT_H_
 #define _WX_APPTRAIT_H_
 
+class WXDLLEXPORT wxObject;
 class WXDLLEXPORT wxAppTraits;
 #if wxUSE_FONTMAP
     class WXDLLEXPORT wxFontMapper;
 #endif // wxUSE_FONTMAP
 class WXDLLEXPORT wxLog;
 class WXDLLEXPORT wxMessageOutput;
+class WXDLLEXPORT wxString;
 
 // ----------------------------------------------------------------------------
 // wxAppTraits: this class defines various configurable aspects of wxApp
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxAppTraitsBase
+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
     // ------------------------------------------------------------------------
 
@@ -96,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
@@ -116,7 +113,7 @@ public:
 // wxConsoleAppTraitsBase: wxAppTraits implementation for the console apps
 // ----------------------------------------------------------------------------
 
-class wxConsoleAppTraitsBase : public wxAppTraits
+class WXDLLIMPEXP_BASE wxConsoleAppTraitsBase : public wxAppTraits
 {
 public:
 #if wxUSE_LOG
@@ -142,7 +139,7 @@ public:
 
 #if wxUSE_GUI
 
-class wxGUIAppTraitsBase : public wxAppTraits
+class WXDLLEXPORT wxGUIAppTraitsBase : public wxAppTraits
 {
 public:
 #if wxUSE_LOG
@@ -172,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;