Fix for always failing assert in GetValue. Save the same value that

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

diff --git a/src/motif/combobox_native.cpp b/src/motif/combobox_native.cpp
index 498ce2565f37d27608a46770bb6c276846043828..107df40f0bf92fab9ec96389f7270b1a9eac5490 100644 (file)
--- a/src/motif/combobox_native.cpp
+++ b/src/motif/combobox_native.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        combobox_native.cpp
+// Name:        src/motif/combobox_native.cpp

 // Purpose:     wxComboBox class
 // Author:      Julian Smart, Ian Brown
 // Modified by:
 // Purpose:     wxComboBox class
 // Author:      Julian Smart, Ian Brown
 // Modified by:


@@ -9,12 +9,17 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#include "wx/setup.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #if wxUSE_COMBOBOX
 
 #include "wx/combobox.h"
 
 
 #if wxUSE_COMBOBOX
 
 #include "wx/combobox.h"
 

+#ifndef WX_PRECOMP
+    #include "wx/arrstr.h"
+#endif
+

 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif
 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif


@@ -88,7 +93,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
 
     Widget buttonWidget= XtVaCreateManagedWidget(name.c_str(),
         xmComboBoxWidgetClass, parentWidget,
 
     Widget buttonWidget= XtVaCreateManagedWidget(name.c_str(),
         xmComboBoxWidgetClass, parentWidget,

-       XmNcomboBoxType, cb_type,
+        XmNcomboBoxType, cb_type,

         NULL);
 
     m_mainWidget = (Widget) buttonWidget;
         NULL);
 
     m_mainWidget = (Widget) buttonWidget;


@@ -111,10 +116,9 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
                    (XtPointer) this);
 
     wxSize best = GetBestSize();
                    (XtPointer) this);
 
     wxSize best = GetBestSize();

-    if( size.x != -1 ) best.x = size.x;
-    if( size.y != -1 ) best.y = size.y;
+    if( size.x != wxDefaultCoord ) best.x = size.x;
+    if( size.y != wxDefaultCoord ) best.y = size.y;

 
 

-    SetCanAddEventHandler(true);

     AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
                   pos.x, pos.y, best.x, best.y);
 
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
                   pos.x, pos.y, best.x, best.y);
 


@@ -123,6 +127,20 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
     return true;
 }
 
     return true;
 }
 

+bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
+                        const wxString& value,
+                        const wxPoint& pos,
+                        const wxSize& size,
+                        const wxArrayString& choices,
+                        long style,
+                        const wxValidator& validator,
+                        const wxString& name)
+{
+    wxCArrayString chs(choices);
+    return Create(parent, id, value, pos, size, chs.GetCount(),
+                  chs.GetStrings(), style, validator, name);
+}
+

 void wxComboBox::AdjustDropDownListSize()
 {
     int newListCount = -1, itemCount = GetCount();
 void wxComboBox::AdjustDropDownListSize()
 {
     int newListCount = -1, itemCount = GetCount();


@@ -149,7 +167,7 @@ wxComboBox::~wxComboBox()
         m_clientDataDict.DestroyData();
 }
 
         m_clientDataDict.DestroyData();
 }
 

-void wxComboBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+void wxComboBox::DoSetSize(int x, int y, int width, int WXUNUSED(height), int sizeFlags)

 {
     // Necessary so it doesn't call wxChoice::SetSize
     wxWindow::DoSetSize(x, y, width, DoGetBestSize().y, sizeFlags);
 {
     // Necessary so it doesn't call wxChoice::SetSize
     wxWindow::DoSetSize(x, y, width, DoGetBestSize().y, sizeFlags);


@@ -164,7 +182,7 @@ wxString wxComboBox::GetValue() const
     return str;
 }
 
     return str;
 }
 

-void wxComboBox::SetString(int n, const wxString& s)
+void wxComboBox::SetString(unsigned int n, const wxString& s)

 {
     wxXmString text(s);
     Widget listBox = GetXmList(this);
 {
     wxXmString text(s);
     Widget listBox = GetXmList(this);


@@ -179,8 +197,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, wxConstCast(value.c_str(), char),
+                   XmNvalue, wxConstCast(val, char),

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


@@ -196,7 +216,23 @@ int wxComboBox::DoAppend(const wxString& item)
     return GetCount() - 1;
 }
 
     return GetCount() - 1;
 }
 

-void wxComboBox::Delete(int n)
+int wxComboBox::DoInsert(const wxString& item, unsigned int pos)
+{
+    wxCHECK_MSG(!(GetWindowStyle() & wxCB_SORT), -1, wxT("can't insert into sorted list"));
+    wxCHECK_MSG(IsValidInsert(pos), -1, wxT("invalid index"));
+
+    if (pos == GetCount())
+        return DoAppend(item);
+
+    wxXmString str( item.c_str() );
+    XmComboBoxAddItem((Widget) m_mainWidget, str(), pos+1, False);
+    m_noStrings ++;
+    AdjustDropDownListSize();
+
+    return GetCount() - 1;
+}
+
+void wxComboBox::Delete(unsigned int n)

 {
 #ifdef LESSTIF_VERSION
     XmListDeletePos (GetXmList(this), n + 1);
 {
 #ifdef LESSTIF_VERSION
     XmListDeletePos (GetXmList(this), n + 1);


@@ -217,7 +253,7 @@ void wxComboBox::Clear()
 #else
     while(m_noStrings > 0)
     {
 #else
     while(m_noStrings > 0)
     {

-       XmComboBoxDeletePos((Widget) m_mainWidget, m_noStrings--);
+        XmComboBoxDeletePos((Widget) m_mainWidget, m_noStrings--);

     }
 #endif
 
     }
 #endif
 


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

+    m_inSetSelection = true;
+

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

-    wxXmString str( GetString(n).c_str() );
+    wxXmString str(GetString(n).c_str());

     XmComboBoxSelectItem((Widget) m_mainWidget, str());
 #endif
     XtVaSetValues( (Widget)m_mainWidget,
                    XmNselectedPosition, n,
                    NULL );
 #endif
     XmComboBoxSelectItem((Widget) m_mainWidget, str());
 #endif
     XtVaSetValues( (Widget)m_mainWidget,
                    XmNselectedPosition, n,
                    NULL );
 #endif

+
+    m_inSetSelection = false;

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


@@ -248,13 +288,15 @@ int wxComboBox::GetSelection (void) const
     return wxDoGetSelectionInList( GetXmList( this ) );
 }
 
     return wxDoGetSelectionInList( GetXmList( this ) );
 }
 

-wxString wxComboBox::GetString(int n) const
+wxString wxComboBox::GetString(unsigned int n) const

 {
     return wxDoGetStringInList( GetXmList(this), n );
 }
 
 {
     return wxDoGetStringInList( GetXmList(this), n );
 }
 

-int wxComboBox::FindString(const wxString& s) const
+int wxComboBox::FindString(const wxString& s, bool WXUNUSED(bCase)) const

 {
 {

+    // FIXME: back to base class for not supported value of bCase
+

     return wxDoFindStringInList( GetXmList( this ), s );
 }
 
     return wxDoFindStringInList( GetXmList( this ), s );
 }
 


@@ -294,7 +336,7 @@ long wxComboBox::GetInsertionPoint() const
     return (long)XmTextGetInsertionPosition( GetXmText(this) );
 }
 
     return (long)XmTextGetInsertionPosition( GetXmText(this) );
 }
 

-long wxComboBox::GetLastPosition() const
+wxTextPos wxComboBox::GetLastPosition() const

 {
     XmTextPosition pos = XmTextGetLastPosition( GetXmText(this) );
     return (long)pos;
 {
     XmTextPosition pos = XmTextGetLastPosition( GetXmText(this) );
     return (long)pos;


@@ -326,6 +368,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:


@@ -336,26 +380,26 @@ 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;
-            event.m_commandInt = idx;
-            event.m_commandString = item->GetString (idx);
+            int idx = cbs->item_position;
+            event.SetInt(idx);
+            event.SetString( item->GetString (idx) );

             if ( item->HasClientObjectData() )
                 event.SetClientObject( item->GetClientObject(idx) );
             else if ( item->HasClientUntypedData() )
                 event.SetClientData( item->GetClientData(idx) );
             if ( item->HasClientObjectData() )
                 event.SetClientObject( item->GetClientObject(idx) );
             else if ( item->HasClientUntypedData() )
                 event.SetClientData( item->GetClientData(idx) );

-            event.m_extraLong = true;
+            event.SetExtraLong(true);

             event.SetEventObject(item);
             event.SetEventObject(item);

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

             break;
         }
     case XmCR_VALUE_CHANGED:
         {
             wxCommandEvent event (wxEVT_COMMAND_TEXT_UPDATED, item->GetId());
             break;
         }
     case XmCR_VALUE_CHANGED:
         {
             wxCommandEvent event (wxEVT_COMMAND_TEXT_UPDATED, item->GetId());

-            event.m_commandInt = -1;
-            event.m_commandString = item->GetValue();
-            event.m_extraLong = true;
+            event.SetInt(-1);
+            event.SetString( item->GetValue() );
+            event.SetExtraLong(true);

             event.SetEventObject(item);
             event.SetEventObject(item);

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

             break;
         }
     default:
             break;
         }
     default: