X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aa61d3525370a9b9fa8c797d9b7f89d96994db5f..c099b53353ec8c689681a1bc8f5117a584e4098d:/include/wx/os2/choice.h diff --git a/include/wx/os2/choice.h b/include/wx/os2/choice.h index 6f7feec581..fc8ec9f976 100644 --- a/include/wx/os2/choice.h +++ b/include/wx/os2/choice.h @@ -12,14 +12,18 @@ #ifndef _WX_CHOICE_H_ #define _WX_CHOICE_H_ +// ---------------------------------------------------------------------------- // Choice item -class WXDLLEXPORT wxChoice: public wxChoiceBase +// ---------------------------------------------------------------------------- + +class WXDLLIMPEXP_CORE wxChoice: public wxChoiceBase { DECLARE_DYNAMIC_CLASS(wxChoice) public: // ctors inline wxChoice() { } + virtual ~wxChoice(); inline wxChoice( wxWindow* pParent ,wxWindowID vId @@ -89,10 +93,8 @@ public: // // Implement base class virtuals // - virtual int DoAppend(const wxString& rsItem); - virtual int DoInsert(const wxString& rsItem, unsigned int pos); - 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; @@ -113,10 +115,13 @@ public: ); protected: - virtual void DoSetItemClientData(unsigned int n, void* pClientData); + 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