X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/853dcc57c6e5ba58e9e546c65ca4965256f3ac21..d77df9f7d023b026a7bbe995ddd36cfdbe07e3d5:/include/wx/cocoa/choice.h diff --git a/include/wx/cocoa/choice.h b/include/wx/cocoa/choice.h index c4f8a5dcb7..9d7f6539ed 100644 --- a/include/wx/cocoa/choice.h +++ b/include/wx/cocoa/choice.h @@ -15,12 +15,12 @@ //#include "wx/cocoa/NSPopUpButton.h" #include "wx/cocoa/NSMenu.h" -class WXDLLIMPEXP_BASE wxSortedArrayString; +class WXDLLIMPEXP_FWD_BASE wxSortedArrayString; // ======================================================================== // wxChoice // ======================================================================== -class WXDLLEXPORT wxChoice: public wxChoiceBase /*, protected wxCocoaNSPopUpButton */, protected wxCocoaNSMenu +class WXDLLIMPEXP_CORE wxChoice: public wxChoiceBase /*, protected wxCocoaNSPopUpButton */, protected wxCocoaNSMenu { DECLARE_DYNAMIC_CLASS(wxChoice) DECLARE_EVENT_TABLE() @@ -80,20 +80,19 @@ protected: // Implementation // ------------------------------------------------------------------------ public: - virtual void Clear(); - virtual void Delete(int); - virtual int GetCount() const; - virtual wxString GetString(int) const; - virtual void SetString(int, const wxString&); + virtual void DoClear(); + 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 DoInsertItems(const wxArrayStringsAdapter& items, + unsigned int pos, + void **clientData, wxClientDataType type); + virtual void DoDeleteOneItem(unsigned int pos); + virtual void DoSetItemClientData(unsigned int, void*); + virtual void* DoGetItemClientData(unsigned int) const; + virtual void SetSelection(int pos); protected: wxSortedArrayString *m_sortedStrings; wxArrayPtrVoid m_itemsClientData;