-#elif defined(__WXMOTIF__)
-#include "wx/generic/dirdlgg.h"
-#elif defined(__WXGTK__)
-#include "wx/generic/dirdlgg.h"
-#elif defined(__WXQT__)
-#include "wx/qt/dirdlg.h"
+
+/*
+ The interface (TODO: make the other classes really derive from it!) is
+ something like this:
+
+class WXDLLEXPORT wxDirDialogBase : public wxDialog
+{
+public:
+ wxDirDialogBase(wxWindow *parent,
+ const wxString& title = wxFileSelectorPromptStr,
+ const wxString& defaultPath = wxEmptyString,
+ long style = wxDD_DEFAULT_STYLE,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& sz = wxDefaultSize,
+ const wxString& name = _T("dirdialog"));
+
+ void SetMessage(const wxString& message);
+ void SetPath(const wxString& path);
+ void SetStyle(long style);
+
+ wxString GetMessage() const;
+ wxString GetPath() const;
+ long GetStyle() const;
+};
+
+*/
+
+// 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"
+ #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