X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/92153555cf08cc818d6f4becfc1576d9c2add023..3d167c0022e409c541a987a23352882445b29819:/include/wx/gtk/filepicker.h diff --git a/include/wx/gtk/filepicker.h b/include/wx/gtk/filepicker.h index 8b92ee6d0a..14267d6260 100644 --- a/include/wx/gtk/filepicker.h +++ b/include/wx/gtk/filepicker.h @@ -61,7 +61,7 @@ protected: \ class WXDLLIMPEXP_CORE wxFileButton : public wxGenericFileButton { public: - wxFileButton() { m_dialog = NULL; } + wxFileButton() { Init(); } wxFileButton(wxWindow *parent, wxWindowID id, const wxString& label = wxFilePickerWidgetLabel, @@ -74,7 +74,8 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxFilePickerWidgetNameStr) { - m_dialog = NULL; + Init(); + m_pickerStyle = style; Create(parent, id, label, path, message, wildcard, pos, size, style, validator, name); } @@ -100,6 +101,7 @@ public: // overrides void OnDialogOK(wxCommandEvent &); virtual void SetPath(const wxString &str); + virtual void SetInitialDirectory(const wxString& dir); // see macro defined above FILEDIRBTN_OVERRIDES @@ -109,6 +111,10 @@ protected: wxDialog *m_dialog; +private: + // common part of all ctors + void Init() { m_dialog = NULL; } + DECLARE_DYNAMIC_CLASS(wxFileButton) }; @@ -134,6 +140,8 @@ public: { Init(); + m_pickerStyle = style; + Create(parent, id, label, path, message, wxEmptyString, pos, size, style, validator, name); } @@ -164,6 +172,7 @@ public: // overrides } virtual void SetPath(const wxString &str); + virtual void SetInitialDirectory(const wxString& dir); // see macro defined above FILEDIRBTN_OVERRIDES