X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/34da808e3fafdfab54d364a7dec9efeeecd7e27e..880d76dfb12d4e8466df30d641bb25c6f71bd398:/include/wx/gtk/filepicker.h diff --git a/include/wx/gtk/filepicker.h b/include/wx/gtk/filepicker.h index f3f6803f71..68a59090e0 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 @@ -107,6 +109,10 @@ public: // overrides protected: wxDialog *m_dialog; +private: + // common part of all ctors + void Init() { m_dialog = NULL; } + DECLARE_DYNAMIC_CLASS(wxFileButton) }; @@ -132,6 +138,8 @@ public: { Init(); + m_pickerStyle = style; + Create(parent, id, label, path, message, wxEmptyString, pos, size, style, validator, name); } @@ -162,18 +170,12 @@ public: // overrides } virtual void SetPath(const wxString &str); + virtual void SetInitialDirectory(const wxString& dir); // see macro defined above FILEDIRBTN_OVERRIDES protected: - // common part of all ctors - void Init() - { - m_dialog = NULL; - m_bIgnoreNextChange = false; - } - wxDialog *m_dialog; public: // used by the GTK callback only @@ -183,6 +185,12 @@ public: // used by the GTK callback only void GTKUpdatePath(const char *gtkpath); private: + void Init() + { + m_dialog = NULL; + m_bIgnoreNextChange = false; + } + DECLARE_DYNAMIC_CLASS(wxDirButton) };