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

corrected check string handling

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11025 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor 2001-07-13 20:58:14 +00:00
parent 6fe8b15355
commit 9f92f6fbab
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mac/carbon/filedlg.cpp
View File

@ -416,13 +416,12 @@ static Boolean CheckFile( ConstStr255Param name , OSType type , OpenUserDataRecP
{
Str255 filename ;
PLstrcpy( filename , name ) ;
p2cstr( filename ) ;
wxString file(filename) ;
file.MakeUpper() ;
if ( data->numfilters > 0 )
{
for( int j = 1 ; j <= filename[0] ; j++ )
{
filename[j] = toupper( filename[j] ) ;
}
//for ( int i = 0 ; i < data->numfilters ; ++i )
int i = data->currentfilter ;
if ( data->extensions[i].Right(2) == ".*" )
@ -436,7 +435,7 @@ static Boolean CheckFile( ConstStr255Param name , OSType type , OpenUserDataRecP
if ( extension.GetChar(0) == '*' )
extension = extension.Mid(1) ;
if ( filename[0] >= extension.Len() && extension == (char*) filename + 1 + filename[0] - extension.Len() )
if ( file.Len() >= extension.Len() && extension == file.Right(extension.Len() ) )
return true ;
}
return false ;

11
src/mac/filedlg.cpp
View File

@ -416,13 +416,12 @@ static Boolean CheckFile( ConstStr255Param name , OSType type , OpenUserDataRecP
{
Str255 filename ;
PLstrcpy( filename , name ) ;
p2cstr( filename ) ;
wxString file(filename) ;
file.MakeUpper() ;
if ( data->numfilters > 0 )
{
for( int j = 1 ; j <= filename[0] ; j++ )
{
filename[j] = toupper( filename[j] ) ;
}
//for ( int i = 0 ; i < data->numfilters ; ++i )
int i = data->currentfilter ;
if ( data->extensions[i].Right(2) == ".*" )
@ -436,7 +435,7 @@ static Boolean CheckFile( ConstStr255Param name , OSType type , OpenUserDataRecP
if ( extension.GetChar(0) == '*' )
extension = extension.Mid(1) ;
if ( filename[0] >= extension.Len() && extension == (char*) filename + 1 + filename[0] - extension.Len() )
if ( file.Len() >= extension.Len() && extension == file.Right(extension.Len() ) )
return true ;
}
return false ;