X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9b1bd0c6e7ed45535fabc574f69b7670fc28191e..0b49ccf8d66e2568e2b0de85c25b406aad39f3b1:/src/motif/combobox.cpp

diff --git a/src/motif/combobox.cpp b/src/motif/combobox.cpp
index 5e81729e67..61dce03a2b 100644
--- a/src/motif/combobox.cpp
+++ b/src/motif/combobox.cpp
@@ -86,7 +86,6 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
     XtAddCallback (buttonWidget, XmNvalueChangedCallback, (XtCallbackProc) wxComboBoxCallback,
         (XtPointer) this);
 
-    SetCanAddEventHandler(TRUE);
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
 
     ChangeBackgroundColour();
@@ -126,7 +125,8 @@ void wxComboBox::SetValue(const wxString& value)
 {
     m_inSetValue = TRUE;
     if( !value.empty() )
-        XmComboBoxSetString( (Widget)m_mainWidget, (char*)value.c_str() );
+        XmComboBoxSetString( (Widget)m_mainWidget,
+                             wxConstCast(value.c_str(), char) );
     m_inSetValue = FALSE;
 }
 
@@ -145,6 +145,22 @@ int wxComboBox::DoAppend(const wxString& item)
     return GetCount() - 1;
 }
 
+int wxComboBox::DoInsert(const wxString& item, int pos)
+{
+    wxCHECK_MSG(!(GetWindowStyle() & wxCB_SORT), -1, wxT("can't insert into sorted list"));
+    wxCHECK_MSG((pos>=0) && (pos<=GetCount()), -1, wxT("invalid index"));
+
+    if (pos == GetCount())
+        return DoAppend(item);
+
+    wxXmString str( item.c_str() );
+    XmComboBoxAddItem((Widget) m_mainWidget, str(), pos+1);
+    m_stringList.Insert(pos, item);
+    m_noStrings ++;
+
+    return pos;
+}
+
 void wxComboBox::Delete(int n)
 {
     XmComboBoxDeletePos((Widget) m_mainWidget, n+1);
@@ -253,8 +269,9 @@ long wxComboBox::GetLastPosition() const
 
 void wxComboBox::Replace(long from, long to, const wxString& value)
 {
-    XmComboBoxReplace ((Widget) m_mainWidget, (XmTextPosition) from, (XmTextPosition) to,
-        (char*) (const char*) value);
+    XmComboBoxReplace ((Widget) m_mainWidget, (XmTextPosition) from,
+                       (XmTextPosition) to,
+                       wxConstCast(value.c_str(), char));
 }
 
 void wxComboBox::Remove(long from, long to)