removed static methods from wxAppTraitsBase, this doesn't work well in non-monolithic...

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

diff --git a/src/motif/checklst.cpp b/src/motif/checklst.cpp
index fc1a76f69c83a5dbaf98dac119dcbdedfc2b2965..7546ec3927c86914cff00462c7c1860666251ee4 100644 (file)
--- a/src/motif/checklst.cpp
+++ b/src/motif/checklst.cpp
@@ -54,17 +54,7 @@ static void CopyStringsAddingPrefix(const wxArrayString& orig,
     copy.Clear();
 
     for(size_t i = 0; i < orig.GetCount(); ++i )
     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
 }
 
 // def ctor: use Create() to really create the control


@@ -85,17 +75,16 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
 }
 
 bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
 }
 
 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,
+                            int n, const wxString choices[],
+                            long style,
+                            const wxValidator& validator,

                             const wxString& name)
 {
                             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, n, choices,

                                     style, validator, name);
                                     style, validator, name);

-    delete[] chs;

     return retVal;
 }   
 
     return retVal;
 }