support metal appearance

[wxWidgets.git] / src / univ / listbox.cpp

diff --git a/src/univ/listbox.cpp b/src/univ/listbox.cpp
index d845c548cf006ba1ee70b53e7fcb42fd11f357a1..d05da69d53f92793babfe4d21e0fbadc8b506946 100644 (file)
--- a/src/univ/listbox.cpp
+++ b/src/univ/listbox.cpp
@@ -55,26 +55,6 @@ END_EVENT_TABLE()
 // construction
 // ----------------------------------------------------------------------------
 
-wxListBox::wxListBox()
-{
-    Init();
-}
-
-wxListBox::wxListBox(wxWindow *parent,
-                     wxWindowID id,
-                     const wxPoint& pos,
-                     const wxSize& size,
-                     int n,
-                     const wxString choices[],
-                     long style,
-                     const wxValidator& validator,
-                     const wxString& name)
-{
-    Init();
-
-    Create(parent, id, pos, size, n, choices, style, validator, name);
-}
-
 void wxListBox::Init()
 {
     // will be calculated later when needed
@@ -100,6 +80,35 @@ void wxListBox::Init()
     m_showScrollbarY = FALSE;
 }
 
+wxListBox::wxListBox(wxWindow *parent,
+                     wxWindowID id,
+                     const wxPoint &pos,
+                     const wxSize &size,
+                     const wxArrayString& choices,
+                     long style,
+                     const wxValidator& validator,
+                     const wxString &name)
+{
+    Init();
+
+    Create(parent, id, pos, size, choices, style, validator, name);
+}
+
+bool wxListBox::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 wxListBox::Create(wxWindow *parent,
                        wxWindowID id,
                        const wxPoint &pos,