X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fb49f3b32e78c4f951c7331447851c3aa0302dde..ab67e8874db324fab5223cc8d5dff8a8de3e2b77:/include/wx/os2/choice.h?ds=sidebyside diff --git a/include/wx/os2/choice.h b/include/wx/os2/choice.h index 883bfe3423..fc8ec9f976 100644 --- a/include/wx/os2/choice.h +++ b/include/wx/os2/choice.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: choice.h +// Name: wx/os2/choice.h // Purpose: wxChoice class // Author: David Webster // Modified by: @@ -12,16 +12,18 @@ #ifndef _WX_CHOICE_H_ #define _WX_CHOICE_H_ -WXDLLEXPORT_DATA(extern const char*) wxChoiceNameStr; - +// ---------------------------------------------------------------------------- // 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 @@ -30,9 +32,7 @@ public: ,int n = 0 ,const wxString asChoices[] = NULL ,long lStyle = 0 -#if wxUSE_VALIDATORS ,const wxValidator& rValidator = wxDefaultValidator -#endif ,const wxString& rsName = wxChoiceNameStr ) { @@ -43,9 +43,28 @@ public: ,n ,asChoices ,lStyle -#if wxUSE_VALIDATORS ,rValidator -#endif + ,rsName + ); + } + + 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 ); } @@ -57,28 +76,32 @@ public: ,int n = 0 ,const wxString asChoices[] = NULL ,long lStyle = 0 -#if wxUSE_VALIDATORS ,const wxValidator& rValidator = wxDefaultValidator -#endif ,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 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 @@ -92,14 +115,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