X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/63ec432bd7b9c93961e85e871bcb31758364a634..02e05e7e4087243171de25b598e701229814b821:/include/wx/mac/carbon/choice.h?ds=sidebyside diff --git a/include/wx/mac/carbon/choice.h b/include/wx/mac/carbon/choice.h index 56de8da3e4..2b0ac93311 100644 --- a/include/wx/mac/carbon/choice.h +++ b/include/wx/mac/carbon/choice.h @@ -69,9 +69,6 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxChoiceNameStr); - // implement base class pure virtuals - virtual int DoAppend(const wxString& item); - virtual int DoInsert(const wxString& item, int pos); virtual void Delete(int n); virtual void Clear(); @@ -87,14 +84,14 @@ public: protected: virtual wxSize DoGetBestSize() const ; + virtual int DoAppend(const wxString& item); + virtual int DoInsert(const wxString& item, int pos); -public: // for wxComboBox only 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; -protected: // free all memory we have (used by Clear() and dtor) // prevent collision with some BSD definitions of macro Free() void FreeData();