as we always have CoreText available under 10.5+, we can properly determine fixed...

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

diff --git a/src/motif/combobox.cpp b/src/motif/combobox.cpp
index d3dc7bc1d45f22c214cb0e5393e3ddc610ff82b0..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);
 
 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,
 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();
 
         return false;
     PreCreation();
 

-    m_noStrings = n;
-

     Widget parentWidget = (Widget) parent->GetClientWidget();
 
     Widget buttonWidget = XtVaCreateManagedWidget(name.c_str(),
     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);
     {
         wxXmString str( choices[i] );
         XmComboBoxAddItem(buttonWidget, str(), 0);

-        m_stringList.Add(choices[i]);
+        m_stringArray.Add(choices[i]);

     }
 
     m_mainWidget = (Widget) buttonWidget;
     }
 
     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));
     {
         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);
     }
 
         InsertNewItemClientData(pos, clientData, i, type);
     }
 


@@ -179,16 +173,14 @@ void wxComboBox::DoDeleteOneItem(unsigned int n)
     XmComboBoxDeletePos((Widget) m_mainWidget, n+1);
     m_stringArray.RemoveAt(n);
     wxControlWithItems::DoDeleteOneItem(n);
     XmComboBoxDeletePos((Widget) m_mainWidget, n+1);
     m_stringArray.RemoveAt(n);
     wxControlWithItems::DoDeleteOneItem(n);

-    m_noStrings--;

 }
 
 void wxComboBox::Clear()
 {
     XmComboBoxDeleteAllItems((Widget) m_mainWidget);
 }
 
 void wxComboBox::Clear()
 {
     XmComboBoxDeleteAllItems((Widget) m_mainWidget);

-    m_stringList.Clear();
+    m_stringArray.Clear();

 
     wxControlWithItems::DoClear();
 
     wxControlWithItems::DoClear();

-    m_noStrings = 0;

 }
 
 void wxComboBox::SetSelection (int n)
 }
 
 void wxComboBox::SetSelection (int n)