Document wxFileCtrl as being in the core library, not in the base one.

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

diff --git a/src/motif/combobox.cpp b/src/motif/combobox.cpp
index f7326ad98c0ce0926b79d7561915a7f21424c4ae..65fcf3f7ac276276a2ac72f1e74f50e805ef8782 100644 (file)
--- a/src/motif/combobox.cpp
+++ b/src/motif/combobox.cpp
@@ -38,8 +38,6 @@
 void  wxComboBoxCallback (Widget w, XtPointer clientData,
                           XmComboBoxSelectionCallbackStruct * cbs);
 
-IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
-
 bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
                         const wxString& value,
                         const wxPoint& pos,
@@ -53,8 +51,6 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
         return false;
     PreCreation();
 
-    m_noStrings = n;
-
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
     Widget buttonWidget = XtVaCreateManagedWidget(name.c_str(),
@@ -72,7 +68,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
     {
         wxXmString str( choices[i] );
         XmComboBoxAddItem(buttonWidget, str(), 0);
-        m_stringList.Add(choices[i]);
+        m_stringArray.Add(choices[i]);
     }
 
     m_mainWidget = (Widget) buttonWidget;
@@ -165,9 +161,7 @@ int wxComboBox::DoInsertItems(const wxArrayStringsAdapter& items,
     {
         wxXmString str( items[i].c_str() );
         XmComboBoxAddItem((Widget) m_mainWidget, str(), GetMotifPosition(pos));
-        wxChar* copy = wxStrcpy(new wxChar[items[i].length() + 1], items[i].c_str());
-        m_stringList.Insert(pos, copy);
-        m_noStrings ++;
+        m_stringArray.Insert(items[i], pos);
         InsertNewItemClientData(pos, clientData, i, type);
     }
 
@@ -177,23 +171,16 @@ int wxComboBox::DoInsertItems(const wxArrayStringsAdapter& items,
 void wxComboBox::DoDeleteOneItem(unsigned int n)
 {
     XmComboBoxDeletePos((Widget) m_mainWidget, n+1);
-    wxStringList::Node *node = m_stringList.Item(n);
-    if (node)
-    {
-        delete[] node->GetData();
-        delete node;
-    }
+    m_stringArray.RemoveAt(n);
     wxControlWithItems::DoDeleteOneItem(n);
-    m_noStrings--;
 }
 
 void wxComboBox::Clear()
 {
     XmComboBoxDeleteAllItems((Widget) m_mainWidget);
-    m_stringList.Clear();
+    m_stringArray.Clear();
 
     wxControlWithItems::DoClear();
-    m_noStrings = 0;
 }
 
 void wxComboBox::SetSelection (int n)
@@ -212,11 +199,7 @@ int wxComboBox::GetSelection (void) const
 
 wxString wxComboBox::GetString(unsigned int n) const
 {
-    wxStringList::Node *node = m_stringList.Item(n);
-    if (node)
-        return wxString(node->GetData ());
-    else
-        return wxEmptyString;
+    return m_stringArray[n];
 }
 
 int wxComboBox::FindString(const wxString& s, bool WXUNUSED(bCase)) const