wxDirDialog now has the same ctor under all platforms and also uses the

correct default title string

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

diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index bb9a22f36d16cea7141c936d94baccc76274b983..32fd5710ec7a96782707b6593eabdde530998b05 100644 (file)
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -9,8 +9,38 @@
 
 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)
+
+/*
+    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(__WIN16__) || (defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS) || defined(__SALFORDC__) || !wxUSE_OLE
         #include "wx/generic/dirdlgg.h"
@@ -32,16 +62,18 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
     #include "wx/generic/dirdlgg.h"
 #endif
 
+#if !defined(__WXMSW__) && !defined(__WXMAC__)
+    #define wxDirDialog wxGenericDirDialog
+#endif
+
 // ----------------------------------------------------------------------------
 // common ::wxDirSelector() function
 // ----------------------------------------------------------------------------
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxDirSelectorPromptStr;
-
 WXDLLEXPORT wxString
 wxDirSelector(const wxString& message = wxDirSelectorPromptStr,
               const wxString& defaultPath = wxEmptyString,
-              long style = wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxDD_NEW_DIR_BUTTON,
+              long style = wxDD_DEFAULT_STYLE,
               const wxPoint& pos = wxDefaultPosition,
               wxWindow *parent = NULL);
 

diff --git a/include/wx/generic/dirdlgg.h b/include/wx/generic/dirdlgg.h
index 4996965dd36030cbbbf7ecccfaed95ca19ab32d2..675f37d1e690d1207dc9c12f13c85a9123cfc1ab 100644 (file)
--- a/include/wx/generic/dirdlgg.h
+++ b/include/wx/generic/dirdlgg.h
@@ -19,11 +19,6 @@
 #pragma interface "dirdlgg.h"
 #endif
 
-#include "wx/defs.h"
-
-#if wxUSE_DIRDLG
-
-#include "wx/dialog.h"
 class WXDLLEXPORT wxGenericDirCtrl;
 class WXDLLEXPORT wxTextCtrl;
 class WXDLLEXPORT wxTreeEvent;
@@ -35,13 +30,15 @@ class WXDLLEXPORT wxTreeEvent;
 class WXDLLEXPORT wxGenericDirDialog: public wxDialog
 {
 public:
-    wxGenericDirDialog(): wxDialog() {}
-    wxGenericDirDialog(wxWindow* parent, const wxString& title,
+    wxGenericDirDialog() : wxDialog() { }
+
+    wxGenericDirDialog(wxWindow* parent,
+                       const wxString& title = wxDirSelectorPromptStr,
                        const wxString& defaultPath = wxEmptyString,
-                       long style = wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxDD_NEW_DIR_BUTTON,
+                       long style = wxDD_DEFAULT_STYLE,
                        const wxPoint& pos = wxDefaultPosition,
                        const wxSize& sz = wxSize(450, 550),
-                       const wxString& name = _T("dialog"));
+                       const wxString& name = wxDirDialogNameStr);
 
     //// Accessors
     inline void SetMessage(const wxString& message) { m_message = message; }
@@ -76,10 +73,4 @@ protected:
     DECLARE_EVENT_TABLE()
 };
 
-#if !defined(__WXMSW__) && !defined(__WXMAC__)
-    #define wxDirDialog wxGenericDirDialog
-#endif
-
-#endif // wxUSE_DIRDLG
-
 #endif // _WX_DIRDLGG_H_

diff --git a/include/wx/mac/dirdlg.h b/include/wx/mac/dirdlg.h
index 44f96238e2c21a0ce0046e0f1642d0cac1aa141e..fe343b9165d8c5d8936c4054f417a5b78907a928 100644 (file)
--- a/include/wx/mac/dirdlg.h
+++ b/include/wx/mac/dirdlg.h
@@ -16,33 +16,34 @@
 #pragma interface "dirdlg.h"
 #endif
 
-#include "wx/dialog.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxFileSelectorPromptStr;
-
-class WXDLLEXPORT wxDirDialog: public wxDialog
+class WXDLLEXPORT wxDirDialog : public wxDialog
 {
-DECLARE_DYNAMIC_CLASS(wxDirDialog)
 public:
-    wxDirDialog(wxWindow *parent, const wxString& message = wxFileSelectorPromptStr,
-        const wxString& defaultPath = "",
-        long style = 0, const wxPoint& pos = wxDefaultPosition);
+    wxDirDialog(wxWindow *parent,
+                const wxString& message = wxDirSelectorPromptStr,
+                const wxString& defaultPath = _T(""),
+                long style = 0,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                const wxString& name = wxDirDialogNameStr);
 
-    inline void SetMessage(const wxString& message) { m_message = message; }
-    inline void SetPath(const wxString& path) { m_path = path; }
-    inline void SetStyle(long style) { m_dialogStyle = style; }
+    void SetMessage(const wxString& message) { m_message = message; }
+    void SetPath(const wxString& path) { m_path = path; }
+    void SetStyle(long style) { m_dialogStyle = style; }
 
-    inline wxString GetMessage() const { return m_message; }
-    inline wxString GetPath() const { return m_path; }
-    inline long GetStyle() const { return m_dialogStyle; }
+    wxString GetMessage() const { return m_message; }
+    wxString GetPath() const { return m_path; }
+    long GetStyle() const { return m_dialogStyle; }
 
-    int ShowModal();
+    virtual int ShowModal();
 
 protected:
     wxString    m_message;
     long        m_dialogStyle;
     wxWindow *  m_parent;
     wxString    m_path;
+
+    DECLARE_DYNAMIC_CLASS(wxDirDialog)
 };
 
 #endif

diff --git a/include/wx/msw/dirdlg.h b/include/wx/msw/dirdlg.h
index dc81929bcb366dc586429e1f1a83d70644bf5315..ac2f48971d40b7c703af9f858caada606d58e891 100644 (file)
--- a/include/wx/msw/dirdlg.h
+++ b/include/wx/msw/dirdlg.h
@@ -16,18 +16,16 @@
 #pragma interface "dirdlg.h"
 #endif
 
-#include "wx/dialog.h"
-
-WXDLLEXPORT_DATA(extern const wxChar*) wxFileSelectorPromptStr;
-
 class WXDLLEXPORT wxDirDialog : public wxDialog
 {
 public:
     wxDirDialog(wxWindow *parent,
-                const wxString& message = wxFileSelectorPromptStr,
+                const wxString& message = wxDirSelectorPromptStr,
                 const wxString& defaultPath = wxEmptyString,
                 long style = 0,
-                const wxPoint& pos = wxDefaultPosition);
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                const wxString& name = wxDirDialogNameStr);
 
     void SetMessage(const wxString& message) { m_message = message; }
     void SetPath(const wxString& path);

diff --git a/src/generic/dirdlgg.cpp b/src/generic/dirdlgg.cpp
index d74c7aadc07595ddae6e05b36f3298b1bbb42e90..6f7157d88608483f2a0b8fd2f204f6830b6ba1c8 100644 (file)
--- a/src/generic/dirdlgg.cpp
+++ b/src/generic/dirdlgg.cpp
@@ -36,8 +36,8 @@
 #endif
 
 #include "wx/statline.h"
-#include "wx/generic/dirctrlg.h"
-#include "wx/generic/dirdlgg.h"
+#include "wx/dirctrl.h"
+#include "wx/dirdlg.h"
 #include "wx/artprov.h"
 #include "wx/bmpbuttn.h"
 

diff --git a/src/mac/carbon/dirdlg.cpp b/src/mac/carbon/dirdlg.cpp
index 079663908a37d4e1a369f30ae8da14e27edba9e1..d38dc40a495a7baa614da489ed638f138884386e 100644 (file)
--- a/src/mac/carbon/dirdlg.cpp
+++ b/src/mac/carbon/dirdlg.cpp
@@ -32,9 +32,13 @@
 IMPLEMENT_CLASS(wxDirDialog, wxDialog)
 #endif
 
-wxDirDialog::wxDirDialog(wxWindow *parent, const wxString& message,
-        const wxString& defaultPath,
-        long style, const wxPoint& pos)
+wxDirDialog::wxDirDialog(wxWindow *parent,
+                         const wxString& message,
+                         const wxString& defaultPath,
+                         long style,
+                         const wxPoint& WXUNUSED(pos),
+                         const wxSize& WXUNUSED(size),
+                         const wxString& WXUNUSED(name))
 {
        wxASSERT_MSG( NavServicesAvailable() , "Navigation Services are not running" ) ;
     m_message = message;

diff --git a/src/mac/dirdlg.cpp b/src/mac/dirdlg.cpp
index 079663908a37d4e1a369f30ae8da14e27edba9e1..d38dc40a495a7baa614da489ed638f138884386e 100644 (file)
--- a/src/mac/dirdlg.cpp
+++ b/src/mac/dirdlg.cpp
@@ -32,9 +32,13 @@
 IMPLEMENT_CLASS(wxDirDialog, wxDialog)
 #endif
 
-wxDirDialog::wxDirDialog(wxWindow *parent, const wxString& message,
-        const wxString& defaultPath,
-        long style, const wxPoint& pos)
+wxDirDialog::wxDirDialog(wxWindow *parent,
+                         const wxString& message,
+                         const wxString& defaultPath,
+                         long style,
+                         const wxPoint& WXUNUSED(pos),
+                         const wxSize& WXUNUSED(size),
+                         const wxString& WXUNUSED(name))
 {
        wxASSERT_MSG( NavServicesAvailable() , "Navigation Services are not running" ) ;
     m_message = message;

diff --git a/src/msw/dirdlg.cpp b/src/msw/dirdlg.cpp
index 7e4d4208471db63bce669d6666300ec8b2cc5b11..63194ca403c8114f82eb2d051d745213a03c9e65 100644 (file)
--- a/src/msw/dirdlg.cpp
+++ b/src/msw/dirdlg.cpp
@@ -81,7 +81,9 @@ wxDirDialog::wxDirDialog(wxWindow *parent,
                          const wxString& message,
                          const wxString& defaultPath,
                          long WXUNUSED(style),
-                         const wxPoint& WXUNUSED(pos))
+                         const wxPoint& WXUNUSED(pos),
+                         const wxSize& WXUNUSED(size),
+                         const wxString& WXUNUSED(name))
 {
     m_message = message;
     m_parent = parent;