reverted, the problem is deeper than that

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

diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index 5da68a5a45a98a012b7486ebd2f764db3eb6eaa5..d2d38c0bdde9ed57485f5d72681f99916cc050f7 100644 (file)
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -1,25 +1,97 @@
 #ifndef _WX_DIRDLG_H_BASE_
 #define _WX_DIRDLG_H_BASE_
 
-#if defined(__WXMSW__)
-#if defined(__WIN16__) || defined(__GNUWIN32__) || defined(__SALFORDC__)
-#include "wx/generic/dirdlgg.h"
-#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(__WXQT__)
-#include "wx/qt/dirdlg.h"
+#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;
+
+#define wxDD_DEFAULT_STYLE \
+    (wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxDD_NEW_DIR_BUTTON)
+
+/*
+    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 Smartphone
+#elif defined(__SMARTPHONE__) && defined(__WXWINCE__)
+
+    #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/os2/dirdlg.h"
-#elif defined(__WXSTUBS__)
-#include "wx/stubs/dirdlg.h"
+
+    #include "wx/mac/dirdlg.h"
+
+// 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
 
+// ----------------------------------------------------------------------------
+// common ::wxDirSelector() function
+// ----------------------------------------------------------------------------
+
+WXDLLEXPORT wxString
+wxDirSelector(const wxString& message = wxDirSelectorPromptStr,
+              const wxString& defaultPath = wxEmptyString,
+              long style = wxDD_DEFAULT_STYLE,
+              const wxPoint& pos = wxDefaultPosition,
+              wxWindow *parent = NULL);
+
+#endif // wxUSE_DIRDLG
+
 #endif
     // _WX_DIRDLG_H_BASE_