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

wxItemContainerImmutable::FindString unified.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35742 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-09-27 17:05:26 +00:00
parent 853dcc57c6
commit 11e62fe658
34 changed files with 290 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gtk1/listbox.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: listbox.cpp
// Name: src/gtk/listbox.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
@@ -931,7 +931,7 @@ void wxListBox::SetString( int n, const wxString &string )
wxString wxListBox::GetString( int n ) const
{
wxCHECK_MSG( m_list != NULL, wxT(""), wxT("invalid listbox") );
wxCHECK_MSG( m_list != NULL, wxEmptyString, wxT("invalid listbox") );
GList *child = g_list_nth( m_list->children, n );
if (child)
@@ -941,7 +941,7 @@ wxString wxListBox::GetString( int n ) const
wxFAIL_MSG(wxT("wrong listbox index"));
return wxT("");
return wxEmptyString;
}
int wxListBox::GetCount() const
@@ -952,15 +952,15 @@ int wxListBox::GetCount() const
return g_list_length(children);
}
int wxListBox::FindString( const wxString &item ) const
int wxListBox::FindString( const wxString &item, bool bCase ) const
{
wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") );
wxCHECK_MSG( m_list != NULL, wxNOT_FOUND, wxT("invalid listbox") );
GList *child = m_list->children;
int count = 0;
while (child)
{
if ( GetRealLabel(child) == item )
if ( item.IsSameAs( GetRealLabel(child), bCase ) )
return count;
count++;
@@ -1262,4 +1262,3 @@ wxListBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
}
#endif // wxUSE_LISTBOX