X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/21d9680705204eff1745c57cf6b96381751243f4..14b44999eb335f3fc84b4362980b1730b8887588:/include/wx/gtk/filepicker.h?ds=sidebyside diff --git a/include/wx/gtk/filepicker.h b/include/wx/gtk/filepicker.h index cda74e3da1..2276335e91 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); } @@ -105,8 +106,14 @@ public: // overrides FILEDIRBTN_OVERRIDES protected: + virtual bool GTKShouldConnectSizeRequest() const { return false; } + wxDialog *m_dialog; +private: + // common part of all ctors + void Init() { m_dialog = NULL; } + DECLARE_DYNAMIC_CLASS(wxFileButton) }; @@ -132,6 +139,8 @@ public: { Init(); + m_pickerStyle = style; + Create(parent, id, label, path, message, wxEmptyString, pos, size, style, validator, name); } @@ -180,9 +189,6 @@ public: // used by the GTK callback only bool m_bIgnoreNextChange; - void UpdatePath(const char *gtkpath) - { m_path = wxString::FromAscii(gtkpath); } - void GTKUpdatePath(const char *gtkpath); private: