fixes for user dash handling (patch 717736)

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

diff --git a/src/motif/combobox_native.cpp b/src/motif/combobox_native.cpp
index aa8eac0f0d54f38b2c535d10c3879d4aee717a41..846d4e10f3e3d799569bbe7eec3a2411af4a0b57 100644 (file)
--- a/src/motif/combobox_native.cpp
+++ b/src/motif/combobox_native.cpp
@@ -179,8 +179,10 @@ void wxComboBox::SetValue(const wxString& value)
 {
     m_inSetValue = true;
 
 {
     m_inSetValue = true;
 

+    // Fix crash; probably an OpenMotif bug
+    const char* val = value.c_str() ? value.c_str() : "";

     XtVaSetValues( GetXmText(this),
     XtVaSetValues( GetXmText(this),

-                   XmNvalue, (char *)value.c_str(),
+                   XmNvalue, wxConstCast(val, char),

                    NULL);
 
     m_inSetValue = false;
                    NULL);
 
     m_inSetValue = false;


@@ -229,19 +231,22 @@ void wxComboBox::Clear()
 
 void wxComboBox::SetSelection (int n)
 {
 
 void wxComboBox::SetSelection (int n)
 {

-#ifdef LESSTIF_VERSION
+    m_inSetSelection = true;
+
+#if wxCHECK_LESSTIF()

     XmListSelectPos (GetXmList(this), n + 1, false);
     SetValue(GetString(n));
 #else
     XmListSelectPos (GetXmList(this), n + 1, false);
     SetValue(GetString(n));
 #else

+#if 0

     wxXmString str( GetString(n).c_str() );
     XmComboBoxSelectItem((Widget) m_mainWidget, str());
     wxXmString str( GetString(n).c_str() );
     XmComboBoxSelectItem((Widget) m_mainWidget, str());

-#if 0
-    // does it work for Motif
+#endif

     XtVaSetValues( (Widget)m_mainWidget,
     XtVaSetValues( (Widget)m_mainWidget,

-                   XmNselectedPosition, n + 1,
+                   XmNselectedPosition, n,

                    NULL );
 #endif
                    NULL );
 #endif

-#endif
+
+    m_inSetSelection = false;

 }
 
 int wxComboBox::GetSelection (void) const
 }
 
 int wxComboBox::GetSelection (void) const


@@ -304,7 +309,7 @@ long wxComboBox::GetLastPosition() const
 void wxComboBox::Replace(long from, long to, const wxString& value)
 {
     XmTextReplace( GetXmText(this), (XmTextPosition)from, (XmTextPosition)to,
 void wxComboBox::Replace(long from, long to, const wxString& value)
 {
     XmTextReplace( GetXmText(this), (XmTextPosition)from, (XmTextPosition)to,

-                   (char*)value.c_str() );
+                   wxConstCast(value.c_str(), char) );

 }
 
 void wxComboBox::Remove(long from, long to)
 }
 
 void wxComboBox::Remove(long from, long to)


@@ -327,6 +332,8 @@ void  wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData,
 {
     wxComboBox *item = (wxComboBox *) clientData;
 
 {
     wxComboBox *item = (wxComboBox *) clientData;
 

+    if( item->m_inSetSelection ) return;
+

     switch (cbs->reason)
     {
     case XmCR_SELECT:
     switch (cbs->reason)
     {
     case XmCR_SELECT:


@@ -337,7 +344,7 @@ void  wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData,
         {
             wxCommandEvent event (wxEVT_COMMAND_COMBOBOX_SELECTED,
                                   item->GetId());
         {
             wxCommandEvent event (wxEVT_COMMAND_COMBOBOX_SELECTED,
                                   item->GetId());

-            int idx = cbs->item_position - 1;
+            int idx = cbs->item_position;

             event.m_commandInt = idx;
             event.m_commandString = item->GetString (idx);
             if ( item->HasClientObjectData() )
             event.m_commandInt = idx;
             event.m_commandString = item->GetString (idx);
             if ( item->HasClientObjectData() )


@@ -346,7 +353,7 @@ void  wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData,
                 event.SetClientData( item->GetClientData(idx) );
             event.m_extraLong = true;
             event.SetEventObject(item);
                 event.SetClientData( item->GetClientData(idx) );
             event.m_extraLong = true;
             event.SetEventObject(item);

-            item->ProcessCommand (event);
+            item->GetEventHandler()->ProcessEvent(event);

             break;
         }
     case XmCR_VALUE_CHANGED:
             break;
         }
     case XmCR_VALUE_CHANGED:


@@ -356,7 +363,7 @@ void  wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData,
             event.m_commandString = item->GetValue();
             event.m_extraLong = true;
             event.SetEventObject(item);
             event.m_commandString = item->GetValue();
             event.m_extraLong = true;
             event.SetEventObject(item);

-            item->ProcessCommand (event);
+            item->GetEventHandler()->ProcessEvent(event);

             break;
         }
     default:
             break;
         }
     default: