don't do anything non trivial (like creating wxFontMapper) in ctors of global objects

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

diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index 144e7636b3ae9e3150ad5940674e5e5efa04fb3b..cee0581f21e27ccfe669b7138d174aff9fd31157 100644 (file)
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -3,38 +3,83 @@
 
 #if wxUSE_DIRDLG
 
 
 #if wxUSE_DIRDLG
 

+#include "wx/dialog.h"
+

 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogNameStr;
 WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogDefaultFolderStr;
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogNameStr;
 WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogDefaultFolderStr;

-WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
+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;
+};
+
+*/

 
 #if defined(__WXMSW__)
 
 #if defined(__WXMSW__)

-#if defined(__WIN16__) || (defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS) || defined(__SALFORDC__)
-#include "wx/generic/dirdlgg.h"
-#else
-#include "wx/msw/dirdlg.h"
-#endif
+    #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__)
 #elif defined(__WXMOTIF__)

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

 #elif defined(__WXGTK__)
 #elif defined(__WXGTK__)

-#include "wx/generic/dirdlgg.h"
-#elif defined(__WXQT__)
-#include "wx/qt/dirdlg.h"
+    #include "wx/generic/dirdlgg.h"
+#elif defined(__WXX11__)
+    #include "wx/generic/dirdlgg.h"
+#elif defined(__WXMGL__)
+    #include "wx/generic/dirdlgg.h"

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

-#ifdef __WXMAC_X__
-#include "wx/generic/dirdlgg.h"
-#else
-#include "wx/mac/dirdlg.h"
-#endif
+    #include "wx/mac/dirdlg.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/generic/dirdlgg.h"

 #elif defined(__WXPM__)
 #elif defined(__WXPM__)

-#include "wx/os2/dirdlg.h"
-#elif defined(__WXSTUBS__)
-#include "wx/stubs/dirdlg.h"
+    #include "wx/generic/dirdlgg.h"
+#endif
+
+#if !defined(__WXMSW__) && !defined(__WXMAC__)
+    #define wxDirDialog wxGenericDirDialog

 #endif
 
 #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
 #endif // wxUSE_DIRDLG
 
 #endif