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

Keep FindString in sync with wxControlWithItems base class.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39438 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-05-29 13:11:40 +00:00
parent 344ff08345
commit 9e6aca686c
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/odcombo.h
View File

@@ -106,7 +106,7 @@ public:
void SetString( int item, const wxString& str ); void SetString( int item, const wxString& str );
wxString GetString( int item ) const; wxString GetString( int item ) const;
unsigned int GetCount() const; unsigned int GetCount() const;
int FindString(const wxString& s) const; int FindString(const wxString& s, bool bCase = false) const;
int GetSelection() const; int GetSelection() const;
//void Populate( int n, const wxString choices[] ); //void Populate( int n, const wxString choices[] );
@@ -257,7 +257,7 @@ public:
virtual unsigned int GetCount() const; virtual unsigned int GetCount() const;
virtual wxString GetString(unsigned int n) const; virtual wxString GetString(unsigned int n) const;
virtual void SetString(unsigned int n, const wxString& s); 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 void Select(int n);
virtual int GetSelection() const; virtual int GetSelection() const;
virtual void SetSelection(int n) { Select(n); } virtual void SetSelection(int n) { Select(n); }

8
src/generic/odcombo.cpp
View File

@@ -438,9 +438,9 @@ void wxVListBoxComboPopup::Delete( unsigned int item )
wxVListBox::SetItemCount( wxVListBox::GetItemCount()-1 ); 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 unsigned int wxVListBoxComboPopup::GetCount() const
@@ -710,10 +710,10 @@ void wxOwnerDrawnComboBox::SetString(unsigned int n, const wxString& s)
m_popupInterface->SetString(n,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") ); wxASSERT_MSG( m_popupInterface, wxT("no popup interface") );
return m_popupInterface->FindString(s); return m_popupInterface->FindString(s, bCase);
} }
void wxOwnerDrawnComboBox::Select(int n) void wxOwnerDrawnComboBox::Select(int n)