Fixing inactive state drawing, and removing warning.

[wxWidgets.git] / src / mac / classic / filedlg.cpp

diff --git a/src/mac/classic/filedlg.cpp b/src/mac/classic/filedlg.cpp
index 110650d4ce57be04698ce230c5e92563a20559f0..7eca40ec7e900bd070e64da4948461828e929e93 100644 (file)
--- a/src/mac/classic/filedlg.cpp
+++ b/src/mac/classic/filedlg.cpp
@@ -169,7 +169,7 @@ void MakeUserDataRec(OpenUserDataRec    *myData , const wxString& filter )
         int filterIndex = 0;
         bool isName = true ;
         wxString current ;
         int filterIndex = 0;
         bool isName = true ;
         wxString current ;

-        for( unsigned int i = 0; i < filter2.Len() ; i++ )
+        for( unsigned int i = 0; i < filter2.length() ; i++ )

         {
             if( filter2.GetChar(i) == wxT('|') )
             {
         {
             if( filter2.GetChar(i) == wxT('|') )
             {


@@ -251,7 +251,7 @@ static Boolean CheckFile( const wxString &filename , OSType type , OpenUserDataR
                 if ( extension.GetChar(0) == '*' )
                     extension = extension.Mid(1) ;
 
                 if ( extension.GetChar(0) == '*' )
                     extension = extension.Mid(1) ;
 

-                if ( file.Len() >= extension.Len() && extension == file.Right(extension.Len() ) )
+                if ( file.length() >= extension.length() && extension == file.Right(extension.length() ) )

                     return true ;
             }
         }
                     return true ;
             }
         }


@@ -584,7 +584,7 @@ int wxFileDialog::ShowModal()
         myData.saveMode = false ;
 
         mNavFilterUPP = NewNavObjectFilterUPP( CrossPlatformFilterCallback ) ;
         myData.saveMode = false ;
 
         mNavFilterUPP = NewNavObjectFilterUPP( CrossPlatformFilterCallback ) ;

-        if ( m_windowStyle & wxMULTIPLE )
+        if ( m_windowStyle & wxFD_MULTIPLE )

             mNavOptions.dialogOptionFlags |= kNavAllowMultipleFiles ;
         else
             mNavOptions.dialogOptionFlags &= ~kNavAllowMultipleFiles ;
             mNavOptions.dialogOptionFlags |= kNavAllowMultipleFiles ;
         else
             mNavOptions.dialogOptionFlags &= ~kNavAllowMultipleFiles ;