showing a bevel button for a multiline label (is not multline on the OS level, but...

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

diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp
index 80b2bb0f6fa937f979941f903a92b9752e9bfba6..9e4b653af8927c11963d090f27d0627bab8f068d 100644 (file)
--- a/src/msw/listbox.cpp
+++ b/src/msw/listbox.cpp
@@ -155,19 +155,6 @@ wxListBox::wxListBox()
     m_selected = 0;
 }
 
     m_selected = 0;
 }
 

-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)
-{
-    Create(parent, id, pos, size, n, choices, style, validator, name);
-}
-

 bool wxListBox::Create(wxWindow *parent,
                        wxWindowID id,
                        const wxPoint& pos,
 bool wxListBox::Create(wxWindow *parent,
                        wxWindowID id,
                        const wxPoint& pos,


@@ -264,6 +251,20 @@ bool wxListBox::Create(wxWindow *parent,
     return TRUE;
 }
 
     return TRUE;
 }
 

+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);
+}
+

 wxListBox::~wxListBox()
 {
     Free();
 wxListBox::~wxListBox()
 {
     Free();