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 8dbcaeeefc4f9ef5a19900deaf1f6e8da1a9d6e2..edce5bb94515797d1b8c892fa02e9499ca130958 100644 (file)
--- 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;
 #endif // wxUSE_FONTMAP
 class WXDLLEXPORT wxLog;
 class WXDLLEXPORT wxMessageOutput;

+class WXDLLEXPORT wxString;

 
 // ----------------------------------------------------------------------------
 // wxAppTraits: this class defines various configurable aspects of wxApp
 
 // ----------------------------------------------------------------------------
 // wxAppTraits: this class defines various configurable aspects of wxApp


@@ -89,6 +90,8 @@ public:
 // include the platform-specific version of the class
 // ----------------------------------------------------------------------------
 
 // 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__)
 #if defined(__WXMSW__)
     #include "wx/msw/apptbase.h"
 #elif defined(__UNIX__)


@@ -96,7 +99,6 @@ public:
 #elif defined(__WXMAC__)
     #include "wx/mac/apptbase.h"
 #else // no platform-specific methods to add to wxAppTraits
 #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 WXDLLIMPEXP_BASE wxAppTraits : public wxAppTraitsBase
     {
     // wxAppTraits must be a class because it was forward declared as class
     class WXDLLIMPEXP_BASE wxAppTraits : public wxAppTraitsBase
     {