Sorry, should be a __UNIX__ test

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

diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index 32fd5710ec7a96782707b6593eabdde530998b05..c1d0a50fd4d5e2f7fb8605eae728f02f6d21d5e9 100644 (file)
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -3,14 +3,15 @@
 
 #if wxUSE_DIRDLG
 
+#include "wx/dialog.h"
+
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogNameStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogDefaultFolderStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxDirSelectorPromptStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
+extern WXDLLEXPORT_DATA(const wxChar*) wxDirDialogNameStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxDirDialogDefaultFolderStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxDirSelectorPromptStr;
 
 #define wxDD_DEFAULT_STYLE \
     (wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxDD_NEW_DIR_BUTTON)
@@ -41,29 +42,42 @@ public:
 
 */
 
-#if defined(__WXMSW__)
-    #if defined(__WIN16__) || (defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS) || defined(__SALFORDC__) || !wxUSE_OLE
-        #include "wx/generic/dirdlgg.h"
-        #define wxDirDialog wxGenericDirDialog
-    #else
-        #include "wx/msw/dirdlg.h"
-    #endif
-#elif defined(__WXMOTIF__)
-    #include "wx/generic/dirdlgg.h"
-#elif defined(__WXGTK__)
-    #include "wx/generic/dirdlgg.h"
-#elif defined(__WXX11__)
+// Universal and non-port related switches with need for generic implementation
+#if defined(__WXMSW__) && (defined(__WXUNIVERSAL__) || \
+                           defined(__SALFORDC__)    || \
+                           !wxUSE_OLE               || \
+                           (defined (__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS))
+
     #include "wx/generic/dirdlgg.h"
-#elif defined(__WXMGL__)
+    #define wxDirDialog wxGenericDirDialog
+
+// MS PocketPC or MS Smartphone
+#elif defined(__WXMSW__) && defined(__WXWINCE__) && !defined(__HANDHELDPC__)
+
     #include "wx/generic/dirdlgg.h"
+    #define wxDirDialog wxGenericDirDialog
+
+// Native MSW
+#elif defined(__WXMSW__)
+
+    #include "wx/msw/dirdlg.h"
+
+// Native Mac
 #elif defined(__WXMAC__)
+
     #include "wx/mac/dirdlg.h"
-#elif defined(__WXPM__)
-    #include "wx/generic/dirdlgg.h"
-#endif
 
-#if !defined(__WXMSW__) && !defined(__WXMAC__)
+// Other ports use generic implementation
+#elif defined(__WXMOTIF__) || \
+      defined(__WXGTK__)   || \
+      defined(__WXX11__)   || \
+      defined(__WXMGL__)   || \
+      defined(__WXCOCOA__) || \
+      defined(__WXPM__)
+
+    #include "wx/generic/dirdlgg.h"
     #define wxDirDialog wxGenericDirDialog
+
 #endif
 
 // ----------------------------------------------------------------------------