X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/584ad2a32fec156c6049145d7ece9a33213aea28..8ba1644391f9fd8fa7f2d2a9c102cd78a1d799cb:/include/wx/cocoa/choice.h?ds=sidebyside diff --git a/include/wx/cocoa/choice.h b/include/wx/cocoa/choice.h index 7db48f39f0..1057527bae 100644 --- a/include/wx/cocoa/choice.h +++ b/include/wx/cocoa/choice.h @@ -4,9 +4,9 @@ // Author: David Elliott // Modified by: // Created: 2003/03/16 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __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 int GetCount() const; - virtual wxString GetString(int) const; - virtual void SetString(int, const wxString&); - virtual int FindString(const wxString&) const; + 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;