X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5dbe15d0bacde245539f54c4d97af6b4696f01f..43ff861df48f0837dac98005dd397c5f127ca136:/include/wx/cocoa/choice.h diff --git a/include/wx/cocoa/choice.h b/include/wx/cocoa/choice.h index 1057527bae..9d7f6539ed 100644 --- a/include/wx/cocoa/choice.h +++ b/include/wx/cocoa/choice.h @@ -20,7 +20,7 @@ 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,19 +80,18 @@ protected: // Implementation // ------------------------------------------------------------------------ public: - virtual void Clear(); - virtual void Delete(unsigned int n); + 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&, unsigned int pos); + 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 DoSetItemClientObject(unsigned int, wxClientData*); - virtual wxClientData* DoGetItemClientObject(unsigned int) const; virtual void SetSelection(int pos); protected: wxSortedArrayString *m_sortedStrings;