X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/687706f5e722ac8a39172024f794ae0ffbd190e2..312f1e6e371f72910501aad1e270e04756d613ec:/src/motif/combobox_native.cpp diff --git a/src/motif/combobox_native.cpp b/src/motif/combobox_native.cpp index a6aad9ebb0..e63ac735e0 100644 --- 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: @@ -92,7 +92,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, Widget buttonWidget= XtVaCreateManagedWidget(name.c_str(), xmComboBoxWidgetClass, parentWidget, - XmNcomboBoxType, cb_type, + XmNcomboBoxType, cb_type, NULL); m_mainWidget = (Widget) buttonWidget; @@ -136,7 +136,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, const wxString& name) { wxCArrayString chs(choices); - return Create(parent, id, value, pos, size, chs.GetCount(), + return Create(parent, id, value, pos, size, chs.GetCount(), chs.GetStrings(), style, validator, name); } @@ -252,7 +252,7 @@ void wxComboBox::Clear() #else while(m_noStrings > 0) { - XmComboBoxDeletePos((Widget) m_mainWidget, m_noStrings--); + XmComboBoxDeletePos((Widget) m_mainWidget, m_noStrings--); } #endif @@ -292,8 +292,10 @@ wxString wxComboBox::GetString(int n) const return wxDoGetStringInList( GetXmList(this), n ); } -int wxComboBox::FindString(const wxString& s) const +int wxComboBox::FindString(const wxString& s, bool bCase) const { + // FIXME: back to base class for not supported value of bCase + return wxDoFindStringInList( GetXmList( this ), s ); } @@ -333,7 +335,7 @@ long wxComboBox::GetInsertionPoint() const return (long)XmTextGetInsertionPosition( GetXmText(this) ); } -long wxComboBox::GetLastPosition() const +wxTextPos wxComboBox::GetLastPosition() const { XmTextPosition pos = XmTextGetLastPosition( GetXmText(this) ); return (long)pos;