X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/243dbf1a5088be31980df51b97831b52cb6986cd..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/os2/choice.h?ds=sidebyside diff --git a/include/wx/os2/choice.h b/include/wx/os2/choice.h index 9c4e0f47a5..2a5e3ae4cc 100644 --- a/include/wx/os2/choice.h +++ b/include/wx/os2/choice.h @@ -1,10 +1,9 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: choice.h +// Name: wx/os2/choice.h // Purpose: wxChoice class // Author: David Webster // Modified by: // Created: 10/13/99 -// RCS-ID: $Id$ // Copyright: (c) David Webster // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -12,14 +11,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 @@ -44,6 +47,27 @@ public: ); } + inline wxChoice( wxWindow* pParent + ,wxWindowID vId + ,const wxPoint& rPos + ,const wxSize& rSize + ,const wxArrayString& asChoices + ,long lStyle = 0 + ,const wxValidator& rValidator = wxDefaultValidator + ,const wxString& rsName = wxChoiceNameStr + ) + { + Create( pParent + ,vId + ,rPos + ,rSize + ,asChoices + ,lStyle + ,rValidator + ,rsName + ); + } + bool Create( wxWindow* pParent ,wxWindowID vId ,const wxPoint& rPos = wxDefaultPosition @@ -55,23 +79,28 @@ public: ,const wxString& rsName = wxChoiceNameStr ); + bool Create( wxWindow* pParent + ,wxWindowID vId + ,const wxPoint& rPos + ,const wxSize& rSize + ,const wxArrayString& asChoices + ,long lStyle = 0 + ,const wxValidator& rValidator = wxDefaultValidator + ,const wxString& rsName = wxChoiceNameStr + ); + // // Implement base class virtuals // - virtual int DoAppend(const wxString& rsItem); - virtual int DoInsert(const wxString& rsItem, int pos); - virtual void Delete(int n); - virtual void Clear(void); + virtual void DoDeleteOneItem(unsigned int n); + virtual void DoClear(void); - virtual int GetCount(void) const; - virtual int GetSelection(void) const ; + virtual unsigned int GetCount() const; + virtual int GetSelection(void) const; virtual void SetSelection(int n); - virtual int FindString(const wxString& rsStr) const; - virtual wxString GetString(int n) const ; - virtual void SetString( int n - ,const wxString& rsStr - ); + virtual wxString GetString(unsigned int n) const; + virtual void SetString(unsigned int n, const wxString& rsStr); // // OS2 only @@ -85,14 +114,13 @@ public: ); protected: - virtual void DoSetItemClientData( int n - ,void* pClientData - ); - virtual void* DoGetItemClientData(int n) const; - virtual void DoSetItemClientObject( int n - ,wxClientData* pClientData - ); - 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* pClientData); + virtual void* DoGetItemClientData(unsigned int n) const; virtual wxSize DoGetBestSize(void) const; virtual void DoSetSize( int nX ,int nY