X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6c8a980fc412792e64256724e02e9d387ee38e21..695237bccd652c60deba347117ba5ab32067880c:/include/wx/gtk/choice.h?ds=inline diff --git a/include/wx/gtk/choice.h b/include/wx/gtk/choice.h index a58c6bb583..279e80d7fb 100644 --- a/include/wx/gtk/choice.h +++ b/include/wx/gtk/choice.h @@ -55,15 +55,10 @@ public: wxString GetString( int n ) const; void SetString( int n, const wxString& string ); - // implementation +protected: wxList m_clientList; // contains the client data for the items - void DisableEvents(); - void EnableEvents(); - void AppendCommon( const wxString &item ); void ApplyWidgetStyle(); - -protected: virtual int DoAppend(const wxString& item); virtual void DoSetItemClientData( int n, void* clientData ); @@ -71,9 +66,11 @@ protected: virtual void DoSetItemClientObject( int n, wxClientData* clientData ); virtual wxClientData* DoGetItemClientObject( int n ) const; + virtual wxSize DoGetBestSize() const; + private: // common part of Create() and DoAppend() - size_t AppendHelper(GtkWidget *menu, const wxString& item); + size_t GtkAppendHelper(GtkWidget *menu, const wxString& item); // this array is only used for controls with wxCB_SORT style, so only // allocate it if it's needed (hence using pointer)