X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8228b8932abaedadbf9568bb3a1eef3ae25fb2a3..3c029873c66cfdc0dcbf52958970273435ba02fc:/include/wx/cocoa/choice.h?ds=sidebyside diff --git a/include/wx/cocoa/choice.h b/include/wx/cocoa/choice.h index a6c53ef892..1057527bae 100644 --- a/include/wx/cocoa/choice.h +++ b/include/wx/cocoa/choice.h @@ -15,7 +15,7 @@ //#include "wx/cocoa/NSPopUpButton.h" #include "wx/cocoa/NSMenu.h" -class WXDLLIMPEXP_BASE wxSortedArrayString; +class WXDLLIMPEXP_FWD_BASE wxSortedArrayString; // ======================================================================== // wxChoice @@ -81,19 +81,19 @@ protected: // ------------------------------------------------------------------------ public: virtual void Clear(); - virtual void Delete(int); - virtual size_t GetCount() const; - virtual wxString GetString(int) const; - virtual void SetString(int, const wxString&); + virtual void Delete(unsigned int n); + virtual unsigned int GetCount() const; + virtual wxString GetString(unsigned int) const; + virtual void SetString(unsigned int pos, const wxString&); virtual int FindString(const wxString& s, bool bCase = false) const; virtual int GetSelection() const; virtual int DoAppend(const wxString&); - virtual int DoInsert(const wxString&, int); - virtual void DoSetItemClientData(int, void*); - virtual void* DoGetItemClientData(int) const; - virtual void DoSetItemClientObject(int, wxClientData*); - virtual wxClientData* DoGetItemClientObject(int) const; - virtual void SetSelection(int); + virtual int DoInsert(const wxString&, unsigned int pos); + virtual void DoSetItemClientData(unsigned int, void*); + virtual void* DoGetItemClientData(unsigned int) const; + virtual void DoSetItemClientObject(unsigned int, wxClientData*); + virtual wxClientData* DoGetItemClientObject(unsigned int) const; + virtual void SetSelection(int pos); protected: wxSortedArrayString *m_sortedStrings; wxArrayPtrVoid m_itemsClientData;