X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a57d600f1aa4bae88f4c9b8d89a35332c412939e..511bec9640556c23969942f7912ada90c19d36ac:/src/generic/odcombo.cpp diff --git a/src/generic/odcombo.cpp b/src/generic/odcombo.cpp index 90cdce3a13..f19b8309d0 100644 --- a/src/generic/odcombo.cpp +++ b/src/generic/odcombo.cpp @@ -384,6 +384,8 @@ void wxVListBoxComboPopup::Clear() ClearClientDatas(); + m_value = wxNOT_FOUND; + if ( IsCreated() ) wxVListBox::SetItemCount(0); } @@ -436,9 +438,9 @@ void wxVListBoxComboPopup::Delete( unsigned int item ) wxVListBox::SetItemCount( wxVListBox::GetItemCount()-1 ); } -int wxVListBoxComboPopup::FindString(const wxString& s) const +int wxVListBoxComboPopup::FindString(const wxString& s, bool bCase) const { - return m_strings.Index(s); + return m_strings.Index(s, bCase); } unsigned int wxVListBoxComboPopup::GetCount() const @@ -677,7 +679,7 @@ void wxOwnerDrawnComboBox::Clear() m_popupInterface->Clear(); - GetTextCtrl()->SetValue(wxEmptyString); + SetValue(wxEmptyString); } void wxOwnerDrawnComboBox::Delete(unsigned int n) @@ -708,10 +710,10 @@ void wxOwnerDrawnComboBox::SetString(unsigned int n, const wxString& s) m_popupInterface->SetString(n,s); } -int wxOwnerDrawnComboBox::FindString(const wxString& s) const +int wxOwnerDrawnComboBox::FindString(const wxString& s, bool bCase) const { wxASSERT_MSG( m_popupInterface, wxT("no popup interface") ); - return m_popupInterface->FindString(s); + return m_popupInterface->FindString(s, bCase); } void wxOwnerDrawnComboBox::Select(int n)