wxURL implementation using WinInet functions under Win32 (patch 839305)

[wxWidgets.git] / src / msw / choice.cpp

diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp
index 39aacbf81baaaa26b0fc5701851b466416ea2a89..220f7c8cfd555c259865017f15d6ad3defe025b0 100644 (file)
--- a/src/msw/choice.cpp
+++ b/src/msw/choice.cpp
@@ -106,23 +106,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
 // creation
 // ----------------------------------------------------------------------------
 
-wxChoice::wxChoice()
-{
-}
-
-wxChoice::wxChoice(wxWindow *parent,
-                   wxWindowID id,
-                   const wxPoint& pos,
-                   const wxSize& size,
-                   int n,
-                   const wxString choices[],
-                   long style,
-                   const wxValidator& validator,
-                   const wxString& name)
-{
-    Create(parent, id, pos, size, n, choices, style, validator, name);
-}
-
 bool wxChoice::Create(wxWindow *parent,
                       wxWindowID id,
                       const wxPoint& pos,
@@ -168,6 +151,20 @@ bool wxChoice::Create(wxWindow *parent,
     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()
 {
     Free();