X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6463b9f5399b8670a0c74f2f8666bc2c9f37a406..2a47cb1ba2461eb90e0cd4c23dab9bfab065c915:/src/univ/choice.cpp diff --git a/src/univ/choice.cpp b/src/univ/choice.cpp index 81925542a1..426b2b4180 100644 --- a/src/univ/choice.cpp +++ b/src/univ/choice.cpp @@ -31,6 +31,7 @@ #ifndef WX_PRECOMP #include "wx/choice.h" + #include "wx/arrstr.h" #endif IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl) @@ -39,6 +40,31 @@ BEGIN_EVENT_TABLE(wxChoice, wxComboBox) EVT_COMBOBOX(-1, wxChoice::OnComboBox) END_EVENT_TABLE() +wxChoice::wxChoice(wxWindow *parent, wxWindowID id, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + long style, + const wxValidator& validator, + const wxString& name) +{ + Create(parent, id, pos, size, choices, style, validator, name); +} + +bool wxChoice::Create(wxWindow *parent, wxWindowID id, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + long style, + const wxValidator& validator, + const wxString& name) +{ + wxCArrayString chs(choices); + + return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(), + style, validator, name); +} + bool wxChoice::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,