X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8228b8932abaedadbf9568bb3a1eef3ae25fb2a3..f089713f9e8be7aa10fd7094b11de361c9bc949a:/include/wx/mac/carbon/choice.h diff --git a/include/wx/mac/carbon/choice.h b/include/wx/mac/carbon/choice.h index 3dbe9c23af..aa7fd46ac3 100644 --- a/include/wx/mac/carbon/choice.h +++ b/include/wx/mac/carbon/choice.h @@ -69,28 +69,28 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxChoiceNameStr); - virtual void Delete(int n); + virtual void Delete(unsigned int n); virtual void Clear(); - virtual size_t GetCount() const ; + virtual unsigned int GetCount() const ; virtual int GetSelection() const ; virtual void SetSelection(int n); int GetCurrentSelection() const { return GetSelection(); } virtual int FindString(const wxString& s, bool bCase = false) const; - virtual wxString GetString(int n) const ; - virtual void SetString( int , const wxString& s ) ; + virtual wxString GetString(unsigned int n) const ; + virtual void SetString(unsigned int pos, const wxString& s); virtual wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ; protected: virtual wxSize DoGetBestSize() const ; virtual int DoAppend(const wxString& item); - virtual int DoInsert(const wxString& item, int pos); + virtual int DoInsert(const wxString& item, unsigned int pos); - 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 void DoSetItemClientData(unsigned int n, void* clientData); + virtual void* DoGetItemClientData(unsigned int n) const; + virtual void DoSetItemClientObject(unsigned int n, wxClientData* clientData); + virtual wxClientData* DoGetItemClientObject(unsigned int n) const; // free all memory we have (used by Clear() and dtor) // prevent collision with some BSD definitions of macro Free()