X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e01c8145b13461ab46a1d24ce51f0ec60420d4d9..40bd6154f1476dbe598c60b4760bbf2fe0d9ab0f:/include/wx/gtk1/choice.h?ds=sidebyside diff --git a/include/wx/gtk1/choice.h b/include/wx/gtk1/choice.h index ba5528bbfc..279e80d7fb 100644 --- a/include/wx/gtk1/choice.h +++ b/include/wx/gtk1/choice.h @@ -51,38 +51,26 @@ public: void SetSelection( int n ); virtual int GetCount() const; - int FindString( const wxString &string ) const; + int FindString( const wxString& string ) const; 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 DoSetClientData( int n, void* clientData ); - virtual void* DoGetClientData( int n ) const; - virtual void DoSetClientObject( int n, wxClientData* clientData ); - virtual wxClientData* DoGetClientObject( int n ) const; - - // the above virtuals hide these virtuals in wxChoiceBase - virtual void DoSetClientData(void* clientData ) - { wxWindowBase::DoSetClientData(clientData); }; - virtual void* DoGetClientData() const - { return(wxWindowBase::DoGetClientData()); }; - virtual void DoSetClientObject( wxClientData* clientData ) - { wxWindowBase::DoSetClientObject(clientData); }; - virtual wxClientData* DoGetClientObject() const - { return(wxWindowBase::DoGetClientObject()); }; + virtual void DoSetItemClientData( int n, void* clientData ); + virtual void* DoGetItemClientData( int n ) const; + 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)