X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aaa6d89a0d0810b001a9217df913b9b74b883c8d..b39fc8d7b1b853cb15f39d51617214b7b90a8872:/src/motif/combobox_native.cpp

diff --git a/src/motif/combobox_native.cpp b/src/motif/combobox_native.cpp
index 107df40f0b..3138681bd6 100644
--- a/src/motif/combobox_native.cpp
+++ b/src/motif/combobox_native.cpp
@@ -197,10 +197,8 @@ void wxComboBox::SetValue(const wxString& value)
 {
     m_inSetValue = true;
 
-    // Fix crash; probably an OpenMotif bug
-    const char* val = value.c_str() ? value.c_str() : "";
     XtVaSetValues( GetXmText(this),
-                   XmNvalue, wxConstCast(val, char),
+                   XmNvalue, value.mb_str(),
                    NULL);
 
     m_inSetValue = false;
@@ -345,7 +343,7 @@ wxTextPos wxComboBox::GetLastPosition() const
 void wxComboBox::Replace(long from, long to, const wxString& value)
 {
     XmTextReplace( GetXmText(this), (XmTextPosition)from, (XmTextPosition)to,
-                   wxConstCast(value.c_str(), char) );
+                   wxConstCast(value.mb_str(), char) );
 }
 
 void wxComboBox::Remove(long from, long to)