Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix motif combobox for Motif < 2.0

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58132 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2009-01-16 13:54:06 +00:00
parent f30ef57e66
commit 4a90d7985c
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/motif/combobox.cpp
View File

@@ -53,8 +53,6 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
return false; return false;
PreCreation(); PreCreation();
m_noStrings = n;
Widget parentWidget = (Widget) parent->GetClientWidget(); Widget parentWidget = (Widget) parent->GetClientWidget();
Widget buttonWidget = XtVaCreateManagedWidget(name.c_str(), Widget buttonWidget = XtVaCreateManagedWidget(name.c_str(),
@@ -72,7 +70,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
{ {
wxXmString str( choices[i] ); wxXmString str( choices[i] );
XmComboBoxAddItem(buttonWidget, str(), 0); XmComboBoxAddItem(buttonWidget, str(), 0);
m_stringList.Add(choices[i]); m_stringArray.Add(choices[i]);
} }
m_mainWidget = (Widget) buttonWidget; m_mainWidget = (Widget) buttonWidget;
@@ -165,9 +163,7 @@ int wxComboBox::DoInsertItems(const wxArrayStringsAdapter& items,
{ {
wxXmString str( items[i].c_str() ); wxXmString str( items[i].c_str() );
XmComboBoxAddItem((Widget) m_mainWidget, str(), GetMotifPosition(pos)); XmComboBoxAddItem((Widget) m_mainWidget, str(), GetMotifPosition(pos));
wxChar* copy = wxStrcpy(new wxChar[items[i].length() + 1], items[i].c_str()); m_stringArray.Insert(items[i], pos);
m_stringList.Insert(pos, copy);
m_noStrings ++;
InsertNewItemClientData(pos, clientData, i, type); InsertNewItemClientData(pos, clientData, i, type);
} }
@@ -179,16 +175,14 @@ void wxComboBox::DoDeleteOneItem(unsigned int n)
XmComboBoxDeletePos((Widget) m_mainWidget, n+1); XmComboBoxDeletePos((Widget) m_mainWidget, n+1);
m_stringArray.RemoveAt(n); m_stringArray.RemoveAt(n);
wxControlWithItems::DoDeleteOneItem(n); wxControlWithItems::DoDeleteOneItem(n);
m_noStrings--;
} }
void wxComboBox::Clear() void wxComboBox::Clear()
{ {
XmComboBoxDeleteAllItems((Widget) m_mainWidget); XmComboBoxDeleteAllItems((Widget) m_mainWidget);
m_stringList.Clear(); m_stringArray.Clear();
wxControlWithItems::DoClear(); wxControlWithItems::DoClear();
m_noStrings = 0;
} }
void wxComboBox::SetSelection (int n) void wxComboBox::SetSelection (int n)