Keep FindString in sync with wxControlWithItems base class.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39438 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/odcombo.h b/include/wx/odcombo.h
index e04aeaa06280f41baa26477141a07b0d76e7c460..1e3f8aaa8ce30495466cb6709e3fa191cb2dabff 100644 (file)
--- a/include/wx/odcombo.h
+++ b/include/wx/odcombo.h
@@ -106,7 +106,7 @@ public:
     void SetString( int item, const wxString& str );
     wxString GetString( int item ) const;
     unsigned int GetCount() const;
-    int FindString(const wxString& s) const;
+    int FindString(const wxString& s, bool bCase = false) const;
     int GetSelection() const;
 
     //void Populate( int n, const wxString choices[] );
@@ -257,7 +257,7 @@ public:
     virtual unsigned int GetCount() const;
     virtual wxString GetString(unsigned int n) const;
     virtual void SetString(unsigned int n, const wxString& s);
-    virtual int FindString(const wxString& s) const;
+    virtual int FindString(const wxString& s, bool bCase = false) const;
     virtual void Select(int n);
     virtual int GetSelection() const;
     virtual void SetSelection(int n) { Select(n); }

diff --git a/src/generic/odcombo.cpp b/src/generic/odcombo.cpp
index 48ed294d6016478bba04e346cfc6c0625c5f0f51..f19b8309d04391eab992de737e88e9f5a6a5bf62 100644 (file)
--- a/src/generic/odcombo.cpp
+++ b/src/generic/odcombo.cpp
@@ -438,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
@@ -710,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)