Also allow key events for Shift-Tab when wxWANTS_CHARS style is used

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

diff --git a/src/univ/checklst.cpp b/src/univ/checklst.cpp
index e4f4547272f2b4d823579a3a858c0349f6dc67a5..f527683e6129b2c44ac7cf337d18a3cf3e1aadf1 100644 (file)
--- a/src/univ/checklst.cpp
+++ b/src/univ/checklst.cpp
@@ -41,14 +41,6 @@
 #include "wx/univ/inphand.h"
 #include "wx/univ/theme.h"
 
 #include "wx/univ/inphand.h"
 #include "wx/univ/theme.h"
 

-// ============================================================================
-// implementation of wxCheckListBoxBase
-// ============================================================================
-
-wxCheckListBoxBase::wxCheckListBoxBase()
-{
-}
-

 // ============================================================================
 // implementation of wxCheckListBox
 // ============================================================================
 // ============================================================================
 // implementation of wxCheckListBox
 // ============================================================================


@@ -59,28 +51,37 @@ IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
 // creation
 // ----------------------------------------------------------------------------
 
 // creation
 // ----------------------------------------------------------------------------
 

-wxCheckListBox::wxCheckListBox()
+void wxCheckListBox::Init()

 {
 {

-    Init();

 }
 
 wxCheckListBox::wxCheckListBox(wxWindow *parent,
                                wxWindowID id,
 }
 
 wxCheckListBox::wxCheckListBox(wxWindow *parent,
                                wxWindowID id,

-                               const wxPoint& pos,
-                               const wxSize& size,
-                               int nStrings,
-                               const wxString *choices,
+                               const wxPoint &pos,
+                               const wxSize &size,
+                               const wxArrayString& choices,

                                long style,
                                const wxValidator& validator,
                                long style,
                                const wxValidator& validator,

-                               const wxString& name)
+                               const wxString &name)

 {
     Init();
 
 {
     Init();
 

-    Create(parent, id, pos, size, nStrings, choices, style, validator, name);
+    Create(parent, id, pos, size, choices, style, validator, name);

 }
 
 }
 

-void wxCheckListBox::Init()
+bool wxCheckListBox::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 wxCheckListBox::Create(wxWindow *parent,
 }
 
 bool wxCheckListBox::Create(wxWindow *parent,