Source cleaning: whitespaces, tabs, TRUE/true, FALSE/false, -1/wxID_ANY/wxDefaultCoor...

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

diff --git a/src/motif/checklst.cpp b/src/motif/checklst.cpp
index fc1a76f69c83a5dbaf98dac119dcbdedfc2b2965..84a057a818c18e054fe68986947a37e46dd56b83 100644 (file)
--- a/src/motif/checklst.cpp
+++ b/src/motif/checklst.cpp
@@ -13,13 +13,17 @@
 // headers & declarations
 // ============================================================================
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "checklst.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 #include "wx/defs.h"
 
 #include "wx/checklst.h"
+#include "wx/arrstr.h"
 
 // ============================================================================
 // implementation
@@ -54,17 +58,7 @@ static void CopyStringsAddingPrefix(const wxArrayString& orig,
     copy.Clear();
 
     for(size_t i = 0; i < orig.GetCount(); ++i )
-        copy[i] = Prefix(FALSE) + orig[i];
-}
-
-static wxString* CopyStringsAddingPrefix(size_t n, const wxString choices[])
-{
-    wxString* copy = new wxString[n];
-
-    for(size_t i = 0; i < n; ++i )
-        copy[i].Add( Prefix(FALSE) + choices[i] );
-
-    return copy;
+        copy.Add( Prefix(FALSE) + orig[i] );
 }
 
 // def ctor: use Create() to really create the control
@@ -84,18 +78,42 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
            style, val, name);
 }
 
+wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
+                               const wxPoint& pos, const wxSize& size,
+                               const wxArrayString& choices,
+                               long style, const wxValidator& val,
+                               const wxString& name)
+                               : wxCheckListBoxBase()
+{
+    Create(parent, id, pos, size, 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)
+{
+    // wxListBox::Create calls set, which adds the prefixes
+    bool retVal = wxListBox::Create(parent, id, pos, size, n, choices,
+                                    style, validator, name);
+    return retVal;
+}   
+
 bool wxCheckListBox::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 wxPoint& pos,
+                            const wxSize& size,
+                            const wxArrayString& choices,
+                            long style,
+                            const wxValidator& validator,
                             const wxString& name)
 {
-    wxString* chs = CopyStringsAddingPrefix(n, choices);
-    bool retVal = wxListBox::Create(parent, id, pos, size, n, chs,
+    // wxListBox::Create calls set, which adds the prefixes
+    bool retVal = wxListBox::Create(parent, id, pos, size, choices,
                                     style, validator, name);
-    delete[] chs;
     return retVal;
 }