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

Corrected FindString

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38623 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2006-04-08 14:58:08 +00:00
parent 2fbfb7d6fb
commit 429bf2309b
1 changed files with 3 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/mac/carbon/listbox.cpp
View File

@@ -390,46 +390,10 @@ void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
int wxListBox::FindString(const wxString& s, bool bCase) const int wxListBox::FindString(const wxString& s, bool bCase) const
{ {
if ( s.Right(1) == wxT("*") ) for ( size_t i = 0 ; i < m_noItems ; ++ i )
{ {
wxString search = s.Left( s.length() - 1 ) ; if (s.IsSameAs(GetString(i), bCase))
int len = search.length() ; return (int)i ;
Str255 s1 , s2 ;
wxMacStringToPascal( search , s2 ) ;
for ( unsigned int i = 0 ; i < m_noItems ; ++ i )
{
wxMacStringToPascal( m_stringArray[i].Left( len ) , s1 ) ;
if ( EqualString( s1 , s2 , bCase , false ) )
return (int)i;
}
if ( s.Left(1) == wxT("*") && s.length() > 1 )
{
wxString st = s ;
st.MakeLower() ;
for ( unsigned int i = 0 ; i < m_noItems ; ++i )
{
if (GetString(i).Lower().Matches(st) )
return (int)i ;
}
}
}
else
{
Str255 s1 , s2 ;
wxMacStringToPascal( s , s2 ) ;
for ( unsigned int i = 0 ; i < m_noItems ; ++ i )
{
wxMacStringToPascal( m_stringArray[i] , s1 ) ;
if ( EqualString( s1 , s2 , bCase , false ) )
return (int)i ;
}
} }
return wxNOT_FOUND; return wxNOT_FOUND;