X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..63ff6f538e6b78af9cf619d624629524e3b0f21c:/src/motif/choice.cpp diff --git a/src/motif/choice.cpp b/src/motif/choice.cpp index 233a0670e5..fbc5fdc03e 100644 --- a/src/motif/choice.cpp +++ b/src/motif/choice.cpp @@ -22,6 +22,7 @@ #include "wx/choice.h" #include "wx/utils.h" +#include "wx/arrstr.h" #ifdef __VMS__ #pragma message disable nosimpint @@ -52,8 +53,6 @@ wxChoice::wxChoice() void wxChoice::Init() { - InitBase(); - m_noStrings = 0; m_buttonWidget = (WXWidget) 0; m_menuWidget = (WXWidget) 0; @@ -145,6 +144,19 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id, return TRUE; } +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); +} + wxChoice::~wxChoice() { // For some reason destroying the menuWidget