X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5dbe15d0bacde245539f54c4d97af6b4696f01f..c4264a8317caf3a5813adc2bc5ddb755595e6481:/include/wx/msw/wince/choicece.h?ds=inline diff --git a/include/wx/msw/wince/choicece.h b/include/wx/msw/wince/choicece.h index 3b827e73a4..5e2d0da680 100644 --- a/include/wx/msw/wince/choicece.h +++ b/include/wx/msw/wince/choicece.h @@ -6,7 +6,7 @@ // Created: 29.07.2004 // RCS-ID: $Id$ // Copyright: (c) Wlodzimierz Skiba -// License: wxWindows licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// #ifndef _WX_CHOICECE_H_BASE_ @@ -29,7 +29,7 @@ WX_DEFINE_EXPORTED_ARRAY_PTR(wxChoice *, wxArrayChoiceSpins); // Choice item // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxChoice : public wxChoiceBase +class WXDLLIMPEXP_CORE wxChoice : public wxChoiceBase { public: // ctors @@ -78,10 +78,8 @@ public: const wxString& name = wxChoiceNameStr); // implement base class pure virtuals - virtual int DoAppend(const wxString& item); - virtual int DoInsert(const wxString& item, unsigned int pos); - virtual void Delete(unsigned int n); - virtual void Clear() ; + virtual void DoDeleteOneItem(unsigned int n); + virtual void DoClear(); virtual unsigned int GetCount() const; virtual int GetSelection() const; @@ -100,10 +98,14 @@ public: virtual bool MSWCommand(WXUINT param, WXWORD id); protected: + virtual int DoInsertItems(const wxArrayStringsAdapter& items, + unsigned int pos, + void **clientData, wxClientDataType type); + virtual void DoSetItemClientData(unsigned int n, void* clientData); virtual void* DoGetItemClientData(unsigned int n) const; - virtual void DoSetItemClientObject(unsigned int n, wxClientData* clientData); - virtual wxClientData* DoGetItemClientObject(unsigned int n) const; + + virtual WXHWND MSWGetItemsHWND() const { return m_hwndBuddy; } // MSW implementation virtual void DoGetPosition(int *x, int *y) const; @@ -122,9 +124,6 @@ protected: const wxValidator& validator, const wxString& name); - // free all memory we have (used by Clear() and dtor) - void Free(); - // the data for the "buddy" list WXHWND m_hwndBuddy; WXFARPROC m_wndProcBuddy;