[ 1216436 ] cleanup 'shadow variable' warnings from gcc in headers.

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

diff --git a/src/univ/checklst.cpp b/src/univ/checklst.cpp
index e4f4547272f2b4d823579a3a858c0349f6dc67a5..6ed02a5f9c28b25ebf8b1551fe134d7001b07146 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"
 
-// ============================================================================
-// implementation of wxCheckListBoxBase
-// ============================================================================
-
-wxCheckListBoxBase::wxCheckListBoxBase()
-{
-}
-
 // ============================================================================
 // implementation of wxCheckListBox
 // ============================================================================
@@ -59,28 +51,37 @@ IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
 // creation
 // ----------------------------------------------------------------------------
 
-wxCheckListBox::wxCheckListBox()
+void wxCheckListBox::Init()
 {
-    Init();
 }
 
 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,
-                               const wxString& name)
+                               const wxString &name)
 {
     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,
@@ -95,11 +96,11 @@ bool wxCheckListBox::Create(wxWindow *parent,
 {
     if ( !wxListBox::Create(parent, id, pos, size,
                             n, choices, style, validator, name) )
-        return FALSE;
+        return false;
 
     CreateInputHandler(wxINP_HANDLER_CHECKLISTBOX);
 
-    return TRUE;
+    return true;
 }
 
 // ----------------------------------------------------------------------------
@@ -108,7 +109,7 @@ bool wxCheckListBox::Create(wxWindow *parent,
 
 bool wxCheckListBox::IsChecked(size_t item) const
 {
-    wxCHECK_MSG( item < m_checks.GetCount(), FALSE,
+    wxCHECK_MSG( item < m_checks.GetCount(), false,
                  _T("invalid index in wxCheckListBox::IsChecked") );
 
     return m_checks[item] != 0;
@@ -147,7 +148,7 @@ int wxCheckListBox::DoAppend(const wxString& item)
     int pos = wxListBox::DoAppend(item);
 
     // the item is initially unchecked
-    m_checks.Insert(FALSE, pos);
+    m_checks.Insert(false, pos);
 
     return pos;
 }
@@ -159,7 +160,7 @@ void wxCheckListBox::DoInsertItems(const wxArrayString& items, int pos)
     size_t count = items.GetCount();
     for ( size_t n = 0; n < count; n++ )
     {
-        m_checks.Insert(FALSE, pos + n);
+        m_checks.Insert(false, pos + n);
     }
 }
 
@@ -171,7 +172,7 @@ void wxCheckListBox::DoSetItems(const wxArrayString& items, void **clientData)
     size_t count = items.GetCount();
     for ( size_t n = 0; n < count; n++ )
     {
-        m_checks.Add(FALSE);
+        m_checks.Add(false);
     }
 }
 
@@ -226,7 +227,7 @@ bool wxCheckListBox::PerformAction(const wxControlAction& action,
         return wxListBox::PerformAction(action, numArg, strArg);
     }
 
-    return TRUE;
+    return true;
 }
 
 // ----------------------------------------------------------------------------
@@ -272,7 +273,7 @@ bool wxStdCheckListboxInputHandler::HandleMouse(wxInputConsumer *consumer,
         {
             lbox->PerformAction(wxACTION_CHECKLISTBOX_TOGGLE, item);
 
-            return TRUE;
+            return true;
         }
     }