X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f9eee2db810695ae4417e9935475f268bb68bbac..fb4888a650065c9a24572d6867345f34adafaa37:/include/wx/os2/combobox.h?ds=sidebyside diff --git a/include/wx/os2/combobox.h b/include/wx/os2/combobox.h index 4e39936991..3eebbb45f4 100644 --- a/include/wx/os2/combobox.h +++ b/include/wx/os2/combobox.h @@ -48,6 +48,29 @@ class WXDLLEXPORT wxComboBox : public wxChoice ); } + inline wxComboBox( wxWindow* pParent + ,wxWindowID vId + ,const wxString& rsValue + ,const wxPoint& rPos + ,const wxSize& rSize + ,const wxArrayString& asChoices + ,long lStyle = 0 + ,const wxValidator& rValidator = wxDefaultValidator + ,const wxString& rsName = wxComboBoxNameStr + ) + { + Create( pParent + ,vId + ,rsValue + ,rPos + ,rSize + ,asChoices + ,lStyle + ,rValidator + ,rsName + ); + } + bool Create( wxWindow* pParent ,wxWindowID vId ,const wxString& rsValue = wxEmptyString @@ -60,6 +83,17 @@ class WXDLLEXPORT wxComboBox : public wxChoice ,const wxString& rsName = wxComboBoxNameStr ); + bool Create( wxWindow* pParent + ,wxWindowID vId + ,const wxString& rsValue + ,const wxPoint& rPos + ,const wxSize& rSize + ,const wxArrayString& asChoices + ,long lStyle = 0 + ,const wxValidator& rValidator = wxDefaultValidator + ,const wxString& rsName = wxComboBoxNameStr + ); + // // List functions: see wxChoice // @@ -76,7 +110,7 @@ class WXDLLEXPORT wxComboBox : public wxChoice virtual void SetInsertionPoint(long lPos); virtual void SetInsertionPointEnd(void); virtual long GetInsertionPoint(void) const; - virtual long GetLastPosition(void) const; + virtual wxTextPos GetLastPosition(void) const; virtual void Replace( long lFrom ,long lTo ,const wxString& rsValue