X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/75cb911c7c8a475269901bf5f0c69c583d79e498..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/gtk/filepicker.h?ds=sidebyside diff --git a/include/wx/gtk/filepicker.h b/include/wx/gtk/filepicker.h index 14267d6260..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 ///////////////////////////////////////////////////////////////////////////// @@ -34,13 +33,6 @@ return NULL; \ } \ \ - virtual bool 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 */ \ @@ -107,8 +99,6 @@ public: // overrides FILEDIRBTN_OVERRIDES protected: - virtual bool GTKShouldConnectSizeRequest() const { return false; } - wxDialog *m_dialog; private: @@ -178,13 +168,6 @@ public: // overrides 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 @@ -194,6 +177,12 @@ public: // used by the GTK callback only void GTKUpdatePath(const char *gtkpath); private: + void Init() + { + m_dialog = NULL; + m_bIgnoreNextChange = false; + } + DECLARE_DYNAMIC_CLASS(wxDirButton) };