non-PCH build fix (according to Tinderbox).

[wxWidgets.git] / src / msw / dir.cpp

diff --git a/src/msw/dir.cpp b/src/msw/dir.cpp
index fc9c933185413555fd869da817ce412491b3254f..3fd7ebb9d47818b78a8c09f304f05e88371f21dd 100644 (file)
--- a/src/msw/dir.cpp
+++ b/src/msw/dir.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "dir.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -34,9 +30,9 @@
 #endif // PCH
 
 #include "wx/dir.h"
 #endif // PCH
 
 #include "wx/dir.h"

-#include "wx/filefn.h"          // for wxPathExists()
+#include "wx/filefn.h"          // for wxDirExists()

 
 

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

     #include "wx/msw/private.h"
 #endif
 
     #include "wx/msw/private.h"
 #endif
 


@@ -175,7 +171,7 @@ void wxDirData::Rewind()
 
 bool wxDirData::Read(wxString *filename)
 {
 
 bool wxDirData::Read(wxString *filename)
 {

-    bool first = FALSE;
+    bool first = false;

 
     WIN32_FIND_DATA finddata;
     #define PTR_TO_FINDDATA (&finddata)
 
     WIN32_FIND_DATA finddata;
     #define PTR_TO_FINDDATA (&finddata)


@@ -192,7 +188,7 @@ bool wxDirData::Read(wxString *filename)
 
         m_finddata = FindFirst(filespec, PTR_TO_FINDDATA);
 
 
         m_finddata = FindFirst(filespec, PTR_TO_FINDDATA);
 

-        first = TRUE;
+        first = true;

     }
 
     if ( !IsFindDataOk(m_finddata) )
     }
 
     if ( !IsFindDataOk(m_finddata) )


@@ -200,7 +196,7 @@ bool wxDirData::Read(wxString *filename)
 #ifdef __WIN32__
         DWORD err = ::GetLastError();
 
 #ifdef __WIN32__
         DWORD err = ::GetLastError();
 

-        if ( err != ERROR_FILE_NOT_FOUND )
+        if ( err != ERROR_FILE_NOT_FOUND && err != ERROR_NO_MORE_FILES )

         {
             wxLogSysError(err, _("Can not enumerate files in directory '%s'"),
                           m_dirname.c_str());
         {
             wxLogSysError(err, _("Can not enumerate files in directory '%s'"),
                           m_dirname.c_str());


@@ -208,7 +204,7 @@ bool wxDirData::Read(wxString *filename)
 #endif // __WIN32__
         //else: not an error, just no (such) files
 
 #endif // __WIN32__
         //else: not an error, just no (such) files
 

-        return FALSE;
+        return false;

     }
 
     const wxChar *name;
     }
 
     const wxChar *name;


@@ -218,7 +214,7 @@ bool wxDirData::Read(wxString *filename)
     {
         if ( first )
         {
     {
         if ( first )
         {

-            first = FALSE;
+            first = false;

         }
         else
         {
         }
         else
         {


@@ -234,7 +230,7 @@ bool wxDirData::Read(wxString *filename)
 #endif // __WIN32__
                 //else: not an error, just no more (such) files
 
 #endif // __WIN32__
                 //else: not an error, just no more (such) files
 

-                return FALSE;
+                return false;

             }
         }
 
             }
         }
 


@@ -277,7 +273,7 @@ bool wxDirData::Read(wxString *filename)
         break;
     }
 
         break;
     }
 

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -287,7 +283,7 @@ bool wxDirData::Read(wxString *filename)
 /* static */
 bool wxDir::Exists(const wxString& dir)
 {
 /* static */
 bool wxDir::Exists(const wxString& dir)
 {

-    return wxPathExists(dir);
+    return wxDirExists(dir);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -306,7 +302,7 @@ bool wxDir::Open(const wxString& dirname)
     delete M_DIR;
     m_data = new wxDirData(dirname);
 
     delete M_DIR;
     m_data = new wxDirData(dirname);
 

-    return TRUE;
+    return true;

 }
 
 bool wxDir::IsOpened() const
 }
 
 bool wxDir::IsOpened() const


@@ -349,7 +345,7 @@ bool wxDir::GetFirst(wxString *filename,
                      const wxString& filespec,
                      int flags) const
 {
                      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();
 
 
     M_DIR->Rewind();
 


@@ -361,9 +357,9 @@ bool wxDir::GetFirst(wxString *filename,
 
 bool wxDir::GetNext(wxString *filename) const
 {
 
 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);
 }
 
     return M_DIR->Read(filename);
 }


@@ -386,7 +382,7 @@ wxGetDirectoryTimes(const wxString& dirname,
     FIND_DATA fd = FindFirst(dirname, &fs);
     if ( !IsFindDataOk(fd) )
     {
     FIND_DATA fd = FindFirst(dirname, &fs);
     if ( !IsFindDataOk(fd) )
     {

-        return FALSE;
+        return false;

     }
 
     *ftAccess = fs.ftLastAccessTime;
     }
 
     *ftAccess = fs.ftLastAccessTime;


@@ -395,7 +391,7 @@ wxGetDirectoryTimes(const wxString& dirname,
 
     FindClose(fd);
 
 
     FindClose(fd);
 

-    return TRUE;
+    return true;

 }
 
 #endif // __WIN32__
 }
 
 #endif // __WIN32__