X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e3a1e3e0e5864c13f26dd886f46adde80eb2b79b..172df1f0351019adaada76e16847b3ca6c2421eb:/src/mgl/dirmgl.cpp?ds=inline

diff --git a/src/mgl/dirmgl.cpp b/src/mgl/dirmgl.cpp
index 62875935fe..b07cd56dc7 100644
--- a/src/mgl/dirmgl.cpp
+++ b/src/mgl/dirmgl.cpp
@@ -18,7 +18,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "dir.h"
 #endif
 
@@ -109,7 +109,7 @@ wxDirData::~wxDirData()
 void wxDirData::SetFileSpec(const wxString& filespec)
 {
 #ifdef __DOS__
-    if ( filespec.IsEmpty() )
+    if ( filespec.empty() )
         m_filespec = _T("*.*");
     else
 #endif
@@ -128,10 +128,10 @@ void wxDirData::Rewind()
 bool wxDirData::Read(wxString *filename)
 {
     PM_findData data;
-    bool matches = FALSE;
+    bool matches = false;
 
     data.dwSize = sizeof(data);
-    
+
     wxString path = m_dirname;
     path += wxFILE_SEP_PATH;
     path.reserve(path.length() + 255); // speed up string concatenation
@@ -141,7 +141,7 @@ bool wxDirData::Read(wxString *filename)
         if ( m_dir )
         {
             if ( !PM_findNextFile(m_dir, &data) )
-                return FALSE;
+                return false;
         }
         else
         {
@@ -149,7 +149,7 @@ bool wxDirData::Read(wxString *filename)
             if ( m_dir == PM_FILE_INVALID )
             {
                 m_dir = NULL;
-                return FALSE;
+                return false;
             }
         }
 
@@ -177,12 +177,12 @@ bool wxDirData::Read(wxString *filename)
             continue;
         }
 
-        matches = m_flags & wxDIR_HIDDEN ? TRUE : !(data.attrib & PM_FILE_HIDDEN);
+        matches = m_flags & wxDIR_HIDDEN ? true : !(data.attrib & PM_FILE_HIDDEN);
     }
 
     *filename = data.name;
 
-    return TRUE;
+    return true;
 }
 
 
@@ -193,7 +193,7 @@ bool wxDirData::Read(wxString *filename)
 /* static */
 bool wxDir::Exists(const wxString& dir)
 {
-    return wxPathExists(dir);
+    return wxDirExists(dir);
 }
 
 // ----------------------------------------------------------------------------
@@ -211,15 +211,15 @@ bool wxDir::Open(const wxString& dirname)
 {
     delete M_DIR;
     m_data = NULL;
-    
+
     if ( !wxDir::Exists(dirname) )
     {
         wxLogError(_("Directory '%s' doesn't exist!"), dirname.c_str());
-        return FALSE;
+        return false;
     }
-    
+
     m_data = new wxDirData(dirname);
-    return TRUE;
+    return true;
 }
 
 bool wxDir::IsOpened() const
@@ -256,7 +256,7 @@ bool wxDir::GetFirst(wxString *filename,
                      const wxString& filespec,
                      int flags) const
 {
-    wxCHECK_MSG( IsOpened(), FALSE, _T("must wxDir::Open() first") );
+    wxCHECK_MSG( IsOpened(), false, _T("must wxDir::Open() first") );
 
     M_DIR->Rewind();
 
@@ -268,9 +268,9 @@ bool wxDir::GetFirst(wxString *filename,
 
 bool wxDir::GetNext(wxString *filename) const
 {
-    wxCHECK_MSG( IsOpened(), FALSE, _T("must wxDir::Open() first") );
+    wxCHECK_MSG( IsOpened(), false, _T("must wxDir::Open() first") );
 
-    wxCHECK_MSG( filename, FALSE, _T("bad pointer in wxDir::GetNext()") );
+    wxCHECK_MSG( filename, false, _T("bad pointer in wxDir::GetNext()") );
 
     return M_DIR->Read(filename);
 }