Fix recreating of wxBitmapComboBox using untyped client data.

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

diff --git a/src/motif/combobox.cpp b/src/motif/combobox.cpp
index d3dc7bc1d45f22c214cb0e5393e3ddc610ff82b0..cf85010c4c13096ee9f465b1711c6e562a5dc77b 100644 (file)
--- a/src/motif/combobox.cpp
+++ b/src/motif/combobox.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
-// RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -38,8 +37,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 +50,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 +67,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 +160,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);
     }
 
@@ -179,16 +172,14 @@ void wxComboBox::DoDeleteOneItem(unsigned int n)
     XmComboBoxDeletePos((Widget) m_mainWidget, n+1);
     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)
@@ -240,7 +231,7 @@ void  wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData,
     case XmCR_SINGLE_SELECT:
     case XmCR_BROWSE_SELECT:
         {
-            wxCommandEvent event (wxEVT_COMMAND_COMBOBOX_SELECTED,
+            wxCommandEvent event (wxEVT_COMBOBOX,
                                   item->GetId());
             event.SetInt(cbs->index - 1);
             event.SetString( item->GetString ( event.GetInt() ) );
@@ -255,7 +246,7 @@ void  wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData,
         }
     case XmCR_VALUE_CHANGED:
         {
-            wxCommandEvent event (wxEVT_COMMAND_TEXT_UPDATED, item->GetId());
+            wxCommandEvent event (wxEVT_TEXT, item->GetId());
             event.SetInt(-1);
             event.SetString( item->GetValue() );
             event.SetExtraLong(true);