reSWIGged

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

diff --git a/src/msw/dir.cpp b/src/msw/dir.cpp
index fc9c933185413555fd869da817ce412491b3254f..d13cf27c0bc7a8ef00704ca0042fc116655e2d5a 100644 (file)
--- a/src/msw/dir.cpp
+++ b/src/msw/dir.cpp
@@ -34,7 +34,7 @@
 #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__
     #include "wx/msw/private.h"
 
 #ifdef __WXMSW__
     #include "wx/msw/private.h"


@@ -175,7 +175,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 +192,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) )


@@ -208,7 +208,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 +218,7 @@ bool wxDirData::Read(wxString *filename)
     {
         if ( first )
         {
     {
         if ( first )
         {

-            first = FALSE;
+            first = false;

         }
         else
         {
         }
         else
         {


@@ -234,7 +234,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 +277,7 @@ bool wxDirData::Read(wxString *filename)
         break;
     }
 
         break;
     }
 

-    return TRUE;
+    return true;

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


@@ -287,7 +287,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 +306,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 +349,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 +361,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 +386,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 +395,7 @@ wxGetDirectoryTimes(const wxString& dirname,
 
     FindClose(fd);
 
 
     FindClose(fd);
 

-    return TRUE;
+    return true;

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