Merge in from trunk r64802 - r68625

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

diff --git a/src/motif/combobox_native.cpp b/src/motif/combobox_native.cpp
index af01743d784897dbe5b77fbce111bfd407f0d6f4..9fbb5241a209021156ba7b5260d695cf70c5d016 100644 (file)
--- a/src/motif/combobox_native.cpp
+++ b/src/motif/combobox_native.cpp
@@ -203,7 +203,7 @@ int wxComboBox::DoInsertItems(const wxArrayStringsAdapter & items,
         wxXmString str( items[i].c_str() );
         XmComboBoxAddItem((Widget) m_mainWidget, str(),
                           GetMotifPosition(pos), False);
         wxXmString str( items[i].c_str() );
         XmComboBoxAddItem((Widget) m_mainWidget, str(),
                           GetMotifPosition(pos), False);

-        m_noStrings ++;
+

         InsertNewItemClientData(pos, clientData, i, type);
     }
 
         InsertNewItemClientData(pos, clientData, i, type);
     }
 


@@ -221,7 +221,7 @@ void wxComboBox::DoDeleteOneItem(unsigned int n)
 #endif
 
     wxControlWithItems::DoDeleteOneItem(n);
 #endif
 
     wxControlWithItems::DoDeleteOneItem(n);

-    m_noStrings--;
+    m_stringArray.RemoveAt(size_t(n));

 
     AdjustDropDownListSize();
 }
 
     AdjustDropDownListSize();
 }


@@ -231,13 +231,14 @@ void wxComboBox::Clear()
 #ifdef LESSTIF_VERSION
     XmListDeleteAllItems (GetXmList(this));
 #else
 #ifdef LESSTIF_VERSION
     XmListDeleteAllItems (GetXmList(this));
 #else

-    while(m_noStrings > 0)
+    size_t n = m_stringArray.GetCount();
+    while(n > 0)

     {
     {

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

     }
 #endif
 
     }
 #endif
 

-    m_noStrings = 0;
+    m_stringArray.Clear();

     AdjustDropDownListSize();
 
     wxTextEntry::Clear();
     AdjustDropDownListSize();
 
     wxTextEntry::Clear();


@@ -326,7 +327,7 @@ void  wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData,
 
 void wxComboBox::ChangeFont(bool keepOriginalSize)
 {
 
 void wxComboBox::ChangeFont(bool keepOriginalSize)
 {

-    if( m_font.Ok() && m_mainWidget != NULL )
+    if( m_font.IsOk() && m_mainWidget != NULL )

     {
         wxDoChangeFont( GetXmText(this), m_font );
         wxDoChangeFont( GetXmList(this), m_font );
     {
         wxDoChangeFont( GetXmText(this), m_font );
         wxDoChangeFont( GetXmList(this), m_font );