X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..69659fd770f615210efac4b4fa741b3ad6223616:/src/univ/choice.cpp?ds=sidebyside diff --git a/src/univ/choice.cpp b/src/univ/choice.cpp index 81925542a1..e8237fef8f 100644 --- a/src/univ/choice.cpp +++ b/src/univ/choice.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: univ/choice.cpp +// Name: src/univ/choice.cpp // Purpose: wxChoice implementation // Author: Vadim Zeitlin // Modified by: @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "univchoice.h" -#endif - #include "wx/wxprec.h" #ifdef __BORLANDC__ @@ -29,16 +25,43 @@ #if wxUSE_CHOICE +#include "wx/choice.h" + #ifndef WX_PRECOMP - #include "wx/choice.h" + #include "wx/arrstr.h" #endif IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl) BEGIN_EVENT_TABLE(wxChoice, wxComboBox) - EVT_COMBOBOX(-1, wxChoice::OnComboBox) + EVT_COMBOBOX(wxID_ANY, 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,