fixed two-step creation of wxCheckListBox

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17200 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/checklst.h b/include/wx/msw/checklst.h
index b8b1eb28fb22723dfdbff07250dc703145b94550..7b7db054e4725986b17a1a71a309fb3c4dec9f6e 100644 (file)
--- a/include/wx/msw/checklst.h
+++ b/include/wx/msw/checklst.h
@@ -37,6 +37,14 @@ public:
                  const wxValidator& validator = wxDefaultValidator,
                  const wxString& name = wxListBoxNameStr);
 
                  const wxValidator& validator = wxDefaultValidator,
                  const wxString& name = wxListBoxNameStr);
 

+  bool Create(wxWindow *parent, wxWindowID id,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                int n = 0, const wxString choices[] = NULL,
+                long style = 0,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxListBoxNameStr);
+

   // override base class virtuals
   virtual void Delete(int n);
 
   // override base class virtuals
   virtual void Delete(int n);
 

diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp
index 028e5db445ced2cf9823b2c737cead3df4efab26..d72f1c609edc03df9cf1595e9d257a86a1582f15 100644 (file)
--- a/src/msw/checklst.cpp
+++ b/src/msw/checklst.cpp
@@ -286,10 +286,21 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
                                long style, const wxValidator& val,
                                const wxString& name)
 {
                                long style, const wxValidator& val,
                                const wxString& name)
 {

-    Create(parent, id, pos, size, nStrings, choices,
-           style | wxLB_OWNERDRAW, val, name);
+    Create(parent, id, pos, size, nStrings, choices, style, val, name);

 }
 
 }
 

+bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
+                            const wxPoint& pos, const wxSize& size,
+                            int n, const wxString choices[],
+                            long style,
+                            const wxValidator& validator, const wxString& name)
+{
+    return wxListBox::Create(parent, id, pos, size, n, choices,
+                             style | wxLB_OWNERDRAW, validator, name);
+}
+                            
+
+

 void wxCheckListBox::Delete(int N)
 {
     wxCHECK_RET( N >= 0 && N < m_noItems,
 void wxCheckListBox::Delete(int N)
 {
     wxCHECK_RET( N >= 0 && N < m_noItems,