ignore WinCE projects and build directories

[wxWidgets.git] / src / mac / carbon / dirmac.cpp

diff --git a/src/mac/carbon/dirmac.cpp b/src/mac/carbon/dirmac.cpp
index 3dd53627a6b45a935c9c99cd8c1cf2030f843fa5..52e9a61e0fb3af919c3b7a0d82ca0e6ab4a7c957 100644 (file)
--- a/src/mac/carbon/dirmac.cpp
+++ b/src/mac/carbon/dirmac.cpp
@@ -125,13 +125,14 @@ bool wxDirData::Read(wxString *filename)
     }
 
     wxString name ;
     }
 
     wxString name ;

+    wxString lowerfilespec = m_filespec.Lower();

 
     while( noErr == err )
     {
         HFSUniStr255 uniname ;
         FSRef fileRef;
         FSCatalogInfo catalogInfo;
 
     while( noErr == err )
     {
         HFSUniStr255 uniname ;
         FSRef fileRef;
         FSCatalogInfo catalogInfo;

-        UInt32 fetched = 0;
+        ItemCount fetched = 0;

 
         err = FSGetCatalogInfoBulk( m_iterator, 1, &fetched, NULL, kFSCatInfoNodeFlags | kFSCatInfoFinderInfo , &catalogInfo , &fileRef, NULL, &uniname );
         
 
         err = FSGetCatalogInfoBulk( m_iterator, 1, &fetched, NULL, kFSCatInfoNodeFlags | kFSCatInfoFinderInfo , &catalogInfo , &fileRef, NULL, &uniname );
         


@@ -146,6 +147,7 @@ bool wxDirData::Read(wxString *filename)
             break ;
 
         name = wxMacHFSUniStrToString( &uniname ) ;
             break ;
 
         name = wxMacHFSUniStrToString( &uniname ) ;

+        wxString lowername = name.Lower();

 
         if ( ( name == wxT(".") || name == wxT("..") ) && !(m_flags & wxDIR_DOTDOT) )
             continue;
 
         if ( ( name == wxT(".") || name == wxT("..") ) && !(m_flags & wxDIR_DOTDOT) )
             continue;


@@ -167,7 +169,7 @@ bool wxDirData::Read(wxString *filename)
         if ( m_filespec.empty() || m_filespec == wxT("*.*") || m_filespec == wxT("*") )
         {
         }
         if ( m_filespec.empty() || m_filespec == wxT("*.*") || m_filespec == wxT("*") )
         {
         }

-        else if ( !wxMatchWild(m_filespec, name , false) )
+        else if ( !wxMatchWild(lowerfilespec, lowername , false) )

         {
             continue ;
         }
         {
             continue ;
         }