X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/58772e4992e1a0601bddbf76fddbf4bb916cf85e..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/gtk/filepicker.h diff --git a/include/wx/gtk/filepicker.h b/include/wx/gtk/filepicker.h index 7a9efccc53..27e1fdc779 100644 --- a/include/wx/gtk/filepicker.h +++ b/include/wx/gtk/filepicker.h @@ -5,7 +5,6 @@ // Modified by: // Created: 14/4/2006 // Copyright: (c) Francesco Montorsi -// RCS-ID: $Id$ // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// @@ -17,29 +16,34 @@ // 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 // and from wxGenericDirButton classes !) //----------------------------------------------------------------------------- -#define FILEDIRBTN_OVERRIDES \ - /* NULL is because of a problem with destruction order which happens */ \ - /* if we pass GetParent(): in fact, this GTK native implementation */ \ - /* needs to create the dialog in ::Create() and not for each user request */ \ - /* in response to the user click as the generic implementation does */ \ - virtual wxWindow *GetDialogParent() \ - { \ - return NULL; \ - } \ - \ - virtual bool Destroy() \ - { \ - m_dialog->Destroy(); \ - return wxButton::Destroy(); \ - } +#define FILEDIRBTN_OVERRIDES \ + /* NULL is because of a problem with destruction order which happens */ \ + /* if we pass GetParent(): in fact, this GTK native implementation */ \ + /* needs to create the dialog in ::Create() and not for each user */ \ + /* request in response to the user click as the generic implementation */ \ + /* does. */ \ + virtual wxWindow *GetDialogParent() \ + { \ + return NULL; \ + } \ + \ + /* 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; } //----------------------------------------------------------------------------- @@ -49,7 +53,7 @@ class WXDLLIMPEXP_CORE wxFileButton : public wxGenericFileButton { public: - wxFileButton() { m_dialog = NULL; } + wxFileButton() { Init(); } wxFileButton(wxWindow *parent, wxWindowID id, const wxString& label = wxFilePickerWidgetLabel, @@ -62,7 +66,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); } @@ -87,19 +92,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 @@ -108,6 +102,9 @@ protected: wxDialog *m_dialog; private: + // common part of all ctors + void Init() { m_dialog = NULL; } + DECLARE_DYNAMIC_CLASS(wxFileButton) }; @@ -133,6 +130,8 @@ public: { Init(); + m_pickerStyle = style; + Create(parent, id, label, path, message, wxEmptyString, pos, size, style, validator, name); } @@ -163,28 +162,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) };