X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e6ccaf1a996c3c363ca047c324f95cc28792e8cd..8add533eb22ba0756f5b426f77ee593bc1aa6fcd:/src/unix/dir.cpp

diff --git a/src/unix/dir.cpp b/src/unix/dir.cpp
index 4680a338ce..0aeffa42b8 100644
--- a/src/unix/dir.cpp
+++ b/src/unix/dir.cpp
@@ -6,7 +6,7 @@
 // Created:     08.12.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "dir.h"
 #endif
 
@@ -136,7 +136,7 @@ bool wxDirData::Read(wxString *filename)
             return FALSE;
             
 #if wxUSE_UNICODE
-        de_d_name = wxConvLibc.cMB2WC( de->d_name );
+        de_d_name = wxConvFileName->cMB2WC( de->d_name );
 #else
         de_d_name = de->d_name;
 #endif            
@@ -172,13 +172,9 @@ bool wxDirData::Read(wxString *filename)
         }
         else
         {
-#if wxUSE_UNICODE
-            matches = TRUE;  // FIXME
-#else
             // test against the pattern
             matches = wxMatchWild(m_filespec, de_d_name,
                                   !(m_flags & wxDIR_HIDDEN));
-#endif
         }
     }