X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1550d5f80d130fea1c05302e890095b7ad27e085..f32eb96401af815f5662b715330802c2e6bfa452:/include/wx/msw/wince/choicece.h diff --git a/include/wx/msw/wince/choicece.h b/include/wx/msw/wince/choicece.h index bb893609f3..0a55eb2b2c 100644 --- a/include/wx/msw/wince/choicece.h +++ b/include/wx/msw/wince/choicece.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Name: wx/msw/wince/choicece.h -// Purpose: wxChoice implementation for Smartphones +// Purpose: wxChoice implementation for smart phones driven by WinCE // Author: Wlodzimierz ABX Skiba // Modified by: // Created: 29.07.2004 @@ -16,24 +16,20 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "choicece.h" -#endif - #include "wx/defs.h" #if wxUSE_CHOICE #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 @@ -82,27 +78,34 @@ 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 int GetCount() const; + virtual unsigned int GetCount() const; virtual int GetSelection() const; virtual void SetSelection(int n); - virtual int FindString(const wxString& s) const; - virtual wxString GetString(int n) const; - virtual void SetString(int n, const wxString& s); + virtual int FindString(const wxString& s, bool bCase = false) const; + 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; } + // return the choice object whose buddy is the given window or NULL + static wxChoice *GetChoiceForListBox(WXHWND hwndBuddy); + + 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; @@ -121,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;