X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aa61d3525370a9b9fa8c797d9b7f89d96994db5f..8b56b16aca250be0f25881456350966a535095e2:/include/wx/gtk/choice.h diff --git a/include/wx/gtk/choice.h b/include/wx/gtk/choice.h index 12d9a3a5fb..172fb049d8 100644 --- a/include/wx/gtk/choice.h +++ b/include/wx/gtk/choice.h @@ -45,7 +45,7 @@ public: Create(parent, id, pos, size, choices, style, validator, name); } - ~wxChoice(); + virtual ~wxChoice(); bool Create( wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -77,12 +77,13 @@ public: static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - virtual bool IsOwnGtkWindow( GdkWindow *window ); - protected: wxList m_clientList; // contains the client data for the items - void DoApplyWidgetStyle(GtkRcStyle *style); + virtual wxSize DoGetBestSize() const; + virtual void DoApplyWidgetStyle(GtkRcStyle *style); + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; + virtual int DoAppend(const wxString& item); virtual int DoInsert(const wxString& item, unsigned int pos); @@ -91,8 +92,6 @@ protected: virtual void DoSetItemClientObject(unsigned int n, wxClientData* clientData); virtual wxClientData* DoGetItemClientObject(unsigned int n) const; - virtual wxSize DoGetBestSize() const; - private: // common part of Create() and DoAppend() int GtkAddHelper(GtkWidget *menu, unsigned int pos, const wxString& item);