X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8228b8932abaedadbf9568bb3a1eef3ae25fb2a3..ce4b7808ca940be201422a066de141ca12f13863:/include/wx/mac/carbon/combobox.h diff --git a/include/wx/mac/carbon/combobox.h b/include/wx/mac/carbon/combobox.h index f9007107bb..1622c07a18 100644 --- a/include/wx/mac/carbon/combobox.h +++ b/include/wx/mac/carbon/combobox.h @@ -85,16 +85,16 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase const wxString& name = wxComboBoxNameStr); // List functions - virtual void Delete(int n); + virtual void Delete(unsigned int n); virtual void Clear(); virtual int GetSelection() const; int GetCurrentSelection() const { return GetSelection(); } virtual void SetSelection(int n); virtual int FindString(const wxString& s, bool bCase = false) const; - virtual wxString GetString(int n) const; + virtual wxString GetString(unsigned int n) const; virtual wxString GetStringSelection() const; - virtual void SetString(int n, const wxString& s); + virtual void SetString(unsigned int n, const wxString& s); // Text field functions virtual wxString GetValue() const; @@ -114,7 +114,7 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase virtual void SetEditable(bool editable); virtual bool IsEditable() const; - virtual size_t GetCount() const; + virtual unsigned int GetCount() const; virtual void Undo(); virtual void Redo(); @@ -143,12 +143,12 @@ protected: virtual void DoMoveWindow(int x, int y, int width, int height); 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; // the subcontrols wxComboBoxText* m_text;