Use wxString::Clone() instead of c_str() in wxThreadEvent copy ctor.

[wxWidgets.git] / include / wx / generic / filepickerg.h

diff --git a/include/wx/generic/filepickerg.h b/include/wx/generic/filepickerg.h
index 5ab51d7b329065b524345ad248b24da11f0737f6..203bd6e682af944e7652d7009bac6c422177c37c 100644 (file)
--- a/include/wx/generic/filepickerg.h
+++ b/include/wx/generic/filepickerg.h
@@ -29,7 +29,7 @@ class WXDLLIMPEXP_CORE wxGenericFileDirButton : public wxButton,
                                                 public wxFileDirPickerWidgetBase
 {
 public:
                                                 public wxFileDirPickerWidgetBase
 {
 public:

-    wxGenericFileDirButton() { }
+    wxGenericFileDirButton() { Init(); }

     wxGenericFileDirButton(wxWindow *parent,
                            wxWindowID id,
                            const wxString& label = wxFilePickerWidgetLabel,
     wxGenericFileDirButton(wxWindow *parent,
                            wxWindowID id,
                            const wxString& label = wxFilePickerWidgetLabel,


@@ -42,15 +42,14 @@ public:
                            const wxValidator& validator = wxDefaultValidator,
                            const wxString& name = wxFilePickerWidgetNameStr)
     {
                            const wxValidator& validator = wxDefaultValidator,
                            const wxString& name = wxFilePickerWidgetNameStr)
     {

+        Init();

         Create(parent, id, label, path, message, wildcard,
                pos, size, style, validator, name);
     }
 
         Create(parent, id, label, path, message, wildcard,
                pos, size, style, validator, name);
     }
 

-    virtual ~wxGenericFileDirButton() {}
-

     virtual wxControl *AsControl() { return this; }
 
     virtual wxControl *AsControl() { return this; }
 

-public:     // overrideable
+public:     // overridable

 
     virtual wxDialog *CreateDialog() = 0;
 
 
     virtual wxDialog *CreateDialog() = 0;
 


@@ -59,6 +58,8 @@ public:     // overrideable
 
     virtual wxEventType GetEventType() const = 0;
 
 
     virtual wxEventType GetEventType() const = 0;
 

+    virtual void SetInitialDirectory(const wxString& dir);
+

 public:
 
     bool Create(wxWindow *parent, wxWindowID id,
 public:
 
     bool Create(wxWindow *parent, wxWindowID id,


@@ -82,6 +83,13 @@ protected:
     // wxButton as some of our bits can conflict with wxButton styles and it
     // just doesn't make sense to use picker styles for wxButton anyhow
     long m_pickerStyle;
     // wxButton as some of our bits can conflict with wxButton styles and it
     // just doesn't make sense to use picker styles for wxButton anyhow
     long m_pickerStyle;

+
+    // Initial directory set by SetInitialDirectory() call or empty.
+    wxString m_initialDir;
+
+private:
+    // common part of all ctors
+    void Init() { m_pickerStyle = -1; }

 };
 
 
 };
 
 


@@ -111,10 +119,16 @@ public:
                pos, size, style, validator, name);
     }
 
                pos, size, style, validator, name);
     }
 

-public:     // overrideable
+public:     // overridable

 
     virtual long GetDialogStyle() const
     {
 
     virtual long GetDialogStyle() const
     {

+        // the derived class must initialize it if it doesn't use the
+        // non-default wxGenericFileDirButton ctor
+        wxASSERT_MSG( m_pickerStyle != -1,
+                      "forgot to initialize m_pickerStyle?" );
+
+

         long filedlgstyle = 0;
 
         if ( m_pickerStyle & wxFLP_OPEN )
         long filedlgstyle = 0;
 
         if ( m_pickerStyle & wxFLP_OPEN )


@@ -131,16 +145,7 @@ public:     // overrideable
         return filedlgstyle;
     }
 
         return filedlgstyle;
     }
 

-    virtual wxDialog *CreateDialog()
-    {
-        wxFileDialog *p = new wxFileDialog(GetDialogParent(), m_message,
-                                    wxEmptyString, wxEmptyString,
-                                    m_wildcard, GetDialogStyle());
-
-        // this sets both the default folder and the default file of the dialog
-        p->SetPath(m_path);
-        return p;
-    }
+    virtual wxDialog *CreateDialog();

 
     wxEventType GetEventType() const
         { return wxEVT_COMMAND_FILEPICKER_CHANGED; }
 
     wxEventType GetEventType() const
         { return wxEVT_COMMAND_FILEPICKER_CHANGED; }


@@ -151,6 +156,10 @@ protected:
     void UpdatePathFromDialog(wxDialog *p)
         { m_path = wxStaticCast(p, wxFileDialog)->GetPath(); }
 
     void UpdatePathFromDialog(wxDialog *p)
         { m_path = wxStaticCast(p, wxFileDialog)->GetPath(); }
 

+    // Set the initial directory for the dialog but without overriding the
+    // directory of the currently selected file, if any.
+    void DoSetInitialDirectory(wxFileDialog* dialog, const wxString& dir);
+

 private:
     DECLARE_DYNAMIC_CLASS(wxGenericFileButton)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxGenericFileButton)
 };


@@ -181,7 +190,7 @@ public:
                pos, size, style, validator, name);
     }
 
                pos, size, style, validator, name);
     }
 

-public:     // overrideable
+public:     // overridable

 
     virtual long GetDialogStyle() const
     {
 
     virtual long GetDialogStyle() const
     {


@@ -195,11 +204,7 @@ public:     // overrideable
         return dirdlgstyle;
     }
 
         return dirdlgstyle;
     }
 

-    virtual wxDialog *CreateDialog()
-    {
-        return new wxDirDialog(GetDialogParent(), m_message, m_path,
-                                   GetDialogStyle());
-    }
+    virtual wxDialog *CreateDialog();

 
     wxEventType GetEventType() const
         { return wxEVT_COMMAND_DIRPICKER_CHANGED; }
 
     wxEventType GetEventType() const
         { return wxEVT_COMMAND_DIRPICKER_CHANGED; }