X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1ebd017e14fe820f790487702bf493fb0e772429..c099b53353ec8c689681a1bc8f5117a584e4098d:/include/wx/os2/choice.h diff --git a/include/wx/os2/choice.h b/include/wx/os2/choice.h index 1dbff3e6a6..fc8ec9f976 100644 --- a/include/wx/os2/choice.h +++ b/include/wx/os2/choice.h @@ -16,7 +16,7 @@ // Choice item // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxChoice: public wxChoiceBase +class WXDLLIMPEXP_CORE wxChoice: public wxChoiceBase { DECLARE_DYNAMIC_CLASS(wxChoice) @@ -93,12 +93,11 @@ public: // // Implement base class virtuals // - virtual void Delete(unsigned int n); - virtual void Clear(void); + virtual void DoDeleteOneItem(unsigned int n); + virtual void DoClear(void); virtual unsigned int GetCount() const; virtual int GetSelection(void) const; - virtual int GetCurrentSelection(void) const { return GetSelection(); } virtual void SetSelection(int n); virtual wxString GetString(unsigned int n) const; @@ -116,12 +115,13 @@ public: ); protected: - virtual int DoAppend(const wxString& rsItem); - virtual int DoInsert(const wxString& rsItem, unsigned int pos); + virtual int DoInsertItems(const wxArrayStringsAdapter& items, + unsigned int pos, + void **clientData, + wxClientDataType type); + virtual void DoSetItemClientData(unsigned int n, void* pClientData); virtual void* DoGetItemClientData(unsigned int n) const; - virtual void DoSetItemClientObject(unsigned int n, wxClientData* pClientData); - virtual wxClientData* DoGetItemClientObject(unsigned int n) const; virtual wxSize DoGetBestSize(void) const; virtual void DoSetSize( int nX ,int nY