X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/64321998dfa6329a3d1266d9562ab43cb9046d85..880d76dfb12d4e8466df30d641bb25c6f71bd398:/include/wx/gtk/filepicker.h?ds=sidebyside diff --git a/include/wx/gtk/filepicker.h b/include/wx/gtk/filepicker.h index 0030e4c61c..68a59090e0 100644 --- a/include/wx/gtk/filepicker.h +++ b/include/wx/gtk/filepicker.h @@ -17,8 +17,6 @@ // that GTK+ < 2.4 #include "wx/generic/filepickerg.h" - - //----------------------------------------------------------------------------- // wxFileButton and wxDirButton shared code // (cannot be a base class since they need to derive from wxGenericFileButton @@ -38,7 +36,8 @@ \ virtual bool Destroy() \ { \ - m_dialog->Destroy(); \ + if (m_dialog) \ + m_dialog->Destroy(); \ return wxButton::Destroy(); \ } \ \ @@ -49,7 +48,9 @@ /* invalid cast from `GtkFileChooserButton' to `GtkButton' */ \ /* so, override wxButton::GTKGetWindow and return NULL as GTK+ doesn't */ \ /* give us access to the internal GdkWindow of a GtkFileChooserButton */ \ - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const \ +protected: \ + virtual GdkWindow * \ + GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const \ { return NULL; } @@ -60,7 +61,7 @@ class WXDLLIMPEXP_CORE wxFileButton : public wxGenericFileButton { public: - wxFileButton() { m_dialog = NULL; } + wxFileButton() { Init(); } wxFileButton(wxWindow *parent, wxWindowID id, const wxString& label = wxFilePickerWidgetLabel, @@ -73,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); } @@ -98,19 +100,8 @@ public: // overrides // event handler for the click void OnDialogOK(wxCommandEvent &); - -public: // some overrides - - // GtkFileChooserButton does not support GTK_FILE_CHOOSER_ACTION_SAVE - // so we replace it with GTK_FILE_CHOOSER_ACTION_OPEN; since wxFD_SAVE - // is not supported, wxFD_OVERWRITE_PROMPT isn't too... - virtual long GetDialogStyle() const - { - return (wxGenericFileButton::GetDialogStyle() & - ~(wxFD_SAVE | wxFD_OVERWRITE_PROMPT)) | wxFD_OPEN; - } - virtual void SetPath(const wxString &str); + virtual void SetInitialDirectory(const wxString& dir); // see macro defined above FILEDIRBTN_OVERRIDES @@ -119,6 +110,9 @@ protected: wxDialog *m_dialog; private: + // common part of all ctors + void Init() { m_dialog = NULL; } + DECLARE_DYNAMIC_CLASS(wxFileButton) }; @@ -144,6 +138,8 @@ public: { Init(); + m_pickerStyle = style; + Create(parent, id, label, path, message, wxEmptyString, pos, size, style, validator, name); } @@ -174,28 +170,27 @@ 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 bool m_bIgnoreNextChange; - void UpdatePath(const char *gtkpath) - { m_path = wxString::FromAscii(gtkpath); } + void GTKUpdatePath(const char *gtkpath); private: + void Init() + { + m_dialog = NULL; + m_bIgnoreNextChange = false; + } + DECLARE_DYNAMIC_CLASS(wxDirButton) };