X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1029169f0860d4d3a99f8a5406d65a7700a72a79..14b44999eb335f3fc84b4362980b1730b8887588:/include/wx/gtk/filepicker.h?ds=sidebyside diff --git a/include/wx/gtk/filepicker.h b/include/wx/gtk/filepicker.h index 50e533f9ee..2276335e91 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,9 +36,22 @@ \ virtual bool Destroy() \ { \ - m_dialog->Destroy(); \ + if (m_dialog) \ + m_dialog->Destroy(); \ return wxButton::Destroy(); \ - } + } \ + \ + /* even if wx derive from wxGenericFileButton, i.e. from wxButton, our */ \ + /* native GTK+ widget does not derive from GtkButton thus *all* uses */ \ + /* GTK_BUTTON(m_widget) macro done by wxButton must be bypassed to */ \ + /* avoid bunch of GTK+ warnings like: */ \ + /* 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 */ \ +protected: \ + virtual GdkWindow * \ + GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const \ + { return NULL; } //----------------------------------------------------------------------------- @@ -50,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, @@ -63,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); } @@ -88,27 +100,20 @@ 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); // see macro defined above 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) }; @@ -134,6 +139,8 @@ public: { Init(); + m_pickerStyle = style; + Create(parent, id, label, path, message, wxEmptyString, pos, size, style, validator, name); } @@ -182,8 +189,7 @@ 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: DECLARE_DYNAMIC_CLASS(wxDirButton)