Made wxGTK's wxEventLoop::IsRunning a little more consistent with

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

diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index 467786df1b9ed50c9c107cb8e08f5f7d7ae814da..c6f4454aac5b13f4f6ce7fa672ef7c9441da4388 100644 (file)
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -12,7 +12,6 @@
 WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogNameStr;
 WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogDefaultFolderStr;
 WXDLLEXPORT_DATA(extern const wxChar*) wxDirSelectorPromptStr;
 WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogNameStr;
 WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogDefaultFolderStr;
 WXDLLEXPORT_DATA(extern const wxChar*) wxDirSelectorPromptStr;

-WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;

 
 #define wxDD_DEFAULT_STYLE \
     (wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxDD_NEW_DIR_BUTTON)
 
 #define wxDD_DEFAULT_STYLE \
     (wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxDD_NEW_DIR_BUTTON)


@@ -43,29 +42,37 @@ 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__)
-    #include "wx/generic/dirdlgg.h"
-#elif defined(__WXMGL__)
+// Universal and non-port related switches with need for generic implementation
+#if defined(__WXMSW__) && (defined(__WXUNIVERSAL__) || \
+                           defined(__WXWINCE__)     || \
+                           defined(__SALFORDC__)    || \
+                           !wxUSE_OLE               || \
+                           (defined (__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS))
+

     #include "wx/generic/dirdlgg.h"
     #include "wx/generic/dirdlgg.h"

+    #define wxDirDialog wxGenericDirDialog
+
+// Native MSW
+#elif defined(__WXMSW__)
+
+    #include "wx/msw/dirdlg.h"
+
+// Native Mac

 #elif defined(__WXMAC__)
 #elif defined(__WXMAC__)

+

     #include "wx/mac/dirdlg.h"
     #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
     #define wxDirDialog wxGenericDirDialog

+

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------