Corrections to wxDirDialog usage.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29122 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index cee0581f21e27ccfe669b7138d174aff9fd31157..b9e6edd3a6183afb6901821e28c0960ba5c9d463 100644 (file)
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -42,31 +42,37 @@ public:
 
 */
 
-#if defined(__WXMSW__)
-    #if defined(__WXWINCE__) || (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(__WXUNIVERSAL__) || \
+    defined(__WXWINCE__)     || \
+    defined(__SALFORDC__)    || \
+    !wxUSE_OLE               || \
+    (defined (__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS)
+
     #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(__WXCOCOA__)
-    #include "wx/generic/dirdlgg.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
 
 // ----------------------------------------------------------------------------