X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8eca1205e2ddc9b24289c655b609ebdbd7bb853e..58ce18f2fdadecffb21e27555115af708325cf18:/include/wx/generic/filepickerg.h?ds=sidebyside diff --git a/include/wx/generic/filepickerg.h b/include/wx/generic/filepickerg.h index 5ab51d7b32..7469df9137 100644 --- 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: - wxGenericFileDirButton() { } + wxGenericFileDirButton() { Init(); } wxGenericFileDirButton(wxWindow *parent, wxWindowID id, const wxString& label = wxFilePickerWidgetLabel, @@ -42,12 +42,11 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxFilePickerWidgetNameStr) { + Init(); Create(parent, id, label, path, message, wildcard, pos, size, style, validator, name); } - virtual ~wxGenericFileDirButton() {} - virtual wxControl *AsControl() { return this; } public: // overrideable @@ -82,6 +81,10 @@ 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; + +private: + // common part of all ctors + void Init() { m_pickerStyle = -1; } }; @@ -115,6 +118,12 @@ public: // overrideable 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 )