X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1169a91932273bc84c23ed9dbd0a2da064d59d66..7a47e45eccd9d709ca782ce01b2c32a18ecd3664:/include/wx/univ/choice.h diff --git a/include/wx/univ/choice.h b/include/wx/univ/choice.h index 3fff15eb4f..7e7d852239 100644 --- a/include/wx/univ/choice.h +++ b/include/wx/univ/choice.h @@ -23,13 +23,23 @@ class WXDLLEXPORT wxChoice : public wxComboBox { public: - wxChoice(); + wxChoice() {} wxChoice(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, int n = 0, const wxString choices[] = (const wxString *) NULL, long style = 0, const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxChoiceNameStr) + { + Create(parent, id, pos, size, n, choices, style, validator, name); + } + wxChoice(wxWindow *parent, wxWindowID id, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + long style = 0, + const wxValidator& validator = wxDefaultValidator, const wxString& name = wxChoiceNameStr); bool Create(wxWindow *parent, wxWindowID id, @@ -39,6 +49,13 @@ public: long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxChoiceNameStr); + bool Create(wxWindow *parent, wxWindowID id, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxChoiceNameStr); private: void OnComboBox(wxCommandEvent &event);