X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8228b8932abaedadbf9568bb3a1eef3ae25fb2a3..233f786e8e6abfe1f5fca6209c63dc12764d6887:/include/wx/msw/wince/choicece.h?ds=sidebyside diff --git a/include/wx/msw/wince/choicece.h b/include/wx/msw/wince/choicece.h index 027837225a..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_ @@ -22,14 +22,14 @@ #include "wx/dynarray.h" -class WXDLLEXPORT wxChoice; +class WXDLLIMPEXP_FWD_CORE wxChoice; WX_DEFINE_EXPORTED_ARRAY_PTR(wxChoice *, wxArrayChoiceSpins); // ---------------------------------------------------------------------------- // Choice item // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxChoice : public wxChoiceBase +class WXDLLIMPEXP_CORE wxChoice : public wxChoiceBase { public: // ctors @@ -78,18 +78,16 @@ public: const wxString& name = wxChoiceNameStr); // implement base class pure virtuals - virtual int DoAppend(const wxString& item); - virtual int DoInsert(const wxString& item, int pos); - virtual void Delete(int n); - virtual void Clear() ; + virtual void DoDeleteOneItem(unsigned int n); + virtual void DoClear(); - virtual size_t GetCount() const; + virtual unsigned int GetCount() const; virtual int GetSelection() const; virtual void SetSelection(int n); virtual int FindString(const wxString& s, bool bCase = false) const; - virtual wxString GetString(int n) const; - virtual void SetString(int n, const wxString& s); + virtual wxString GetString(unsigned int n) const; + virtual void SetString(unsigned int n, const wxString& s); // get the subclassed window proc of the buddy list of choices WXFARPROC GetBuddyWndProc() const { return m_wndProcBuddy; } @@ -100,10 +98,14 @@ public: virtual bool MSWCommand(WXUINT param, WXWORD id); protected: - virtual void DoSetItemClientData( int n, void* clientData ); - virtual void* DoGetItemClientData( int n ) const; - virtual void DoSetItemClientObject( int n, wxClientData* clientData ); - virtual wxClientData* DoGetItemClientObject( int n ) const; + 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 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;