/////////////////////////////////////////////////////////////////////////////
-// Name: univ/choice.cpp
+// Name: src/univ/choice.cpp
// Purpose: wxChoice implementation
// Author: Vadim Zeitlin
// Modified by:
// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "univchoice.h"
-#endif
-
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#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()
-{
-}
-
-wxChoice::wxChoice(wxWindow *parent,
- wxWindowID id,
+wxChoice::wxChoice(wxWindow *parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
- int n,
- const wxString choices[],
+ const wxArrayString& choices,
long style,
const wxValidator& validator,
const wxString& name)
{
- Create(parent, id, pos, size, n, choices, style, validator, 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,