Better temporary fix.

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

diff --git a/src/os2/dir.cpp b/src/os2/dir.cpp
index 7cea36f1326e324979d1343617d51af72b145639..e3e7188afd183514b6f96cf75ba2948b7b229d4d 100644 (file)
--- a/src/os2/dir.cpp
+++ b/src/os2/dir.cpp
@@ -6,7 +6,7 @@
 // Created:     08.12.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     08.12.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #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"
 


@@ -79,9 +75,9 @@ static inline FIND_DATA FindFirst(
     FIND_DATA                   hDir = HDIR_CREATE;
     FIND_ATTR                   rc;
 
     FIND_DATA                   hDir = HDIR_CREATE;
     FIND_ATTR                   rc;
 

-    rc = ::DosFindFirst( rsSpec.c_str()
+    rc = ::DosFindFirst( (PSZ)rsSpec.c_str()

                         ,&hDir
                         ,&hDir

-                       ,0x37 // was: FILE_NORMAL
+                        ,0x37 // was: FILE_NORMAL

                         ,pFinddata
                         ,sizeof(FILEFINDBUF3)
                         ,&ulFindCount
                         ,pFinddata
                         ,sizeof(FILEFINDBUF3)
                         ,&ulFindCount


@@ -110,7 +106,7 @@ static const wxChar* GetNameFromFindData(
   FIND_STRUCT*                      pFinddata
 )
 {
   FIND_STRUCT*                      pFinddata
 )
 {

-    return pFinddata->achName;
+    return (wxChar*)pFinddata->achName;

 }
 
 static const FIND_ATTR GetAttrFromFindData(
 }
 
 static const FIND_ATTR GetAttrFromFindData(


@@ -213,7 +209,7 @@ bool wxDirData::Read(
   wxString*                         psFilename
 )
 {
   wxString*                         psFilename
 )
 {

-    bool                            bFirst = FALSE;
+    bool                            bFirst = false;

 
     FILEFINDBUF3                    vFinddata;
     #define PTR_TO_FINDDATA (&vFinddata)
 
     FILEFINDBUF3                    vFinddata;
     #define PTR_TO_FINDDATA (&vFinddata)


@@ -234,12 +230,12 @@ bool wxDirData::Read(
         m_vFinddata = FindFirst( sFilespec
                                 ,PTR_TO_FINDDATA
                                );
         m_vFinddata = FindFirst( sFilespec
                                 ,PTR_TO_FINDDATA
                                );

-        bFirst = TRUE;
+        bFirst = true;

     }
 
     if ( !IsFindDataOk(m_vFinddata) )
     {
     }
 
     if ( !IsFindDataOk(m_vFinddata) )
     {

-        return FALSE;
+        return false;

     }
 
     const wxChar*                   zName;
     }
 
     const wxChar*                   zName;


@@ -249,7 +245,7 @@ bool wxDirData::Read(
     {
         if (bFirst)
         {
     {
         if (bFirst)
         {

-            bFirst = FALSE;
+            bFirst = false;

         }
         else
         {
         }
         else
         {


@@ -257,7 +253,7 @@ bool wxDirData::Read(
                           ,PTR_TO_FINDDATA
                          ))
             {
                           ,PTR_TO_FINDDATA
                          ))
             {

-                return FALSE;
+                return false;

             }
         }
 
             }
         }
 


@@ -309,7 +305,7 @@ bool wxDirData::Read(
         *psFilename = zName;
         break;
     }
         *psFilename = zName;
         break;
     }

-    return TRUE;
+    return true;

 } // end of wxDirData::Read
 
 // ----------------------------------------------------------------------------
 } // end of wxDirData::Read
 
 // ----------------------------------------------------------------------------


@@ -321,7 +317,7 @@ bool wxDir::Exists(
   const wxString&                   rsDir
 )
 {
   const wxString&                   rsDir
 )
 {

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

 } // end of wxDir::Exists
 
 // ----------------------------------------------------------------------------
 } // end of wxDir::Exists
 
 // ----------------------------------------------------------------------------


@@ -343,7 +339,7 @@ bool wxDir::Open(
 {
     delete M_DIR;
     m_data = new wxDirData(rsDirname);
 {
     delete M_DIR;
     m_data = new wxDirData(rsDirname);

-    return TRUE;
+    return true;

 } // end of wxDir::Open
 
 bool wxDir::IsOpened() const
 } // end of wxDir::Open
 
 bool wxDir::IsOpened() const


@@ -388,7 +384,7 @@ bool wxDir::GetFirst(
 , int                               nFlags
 ) const
 {
 , int                               nFlags
 ) const
 {

-    wxCHECK_MSG( IsOpened(), FALSE, _T("must wxDir::Open() first") );
+    wxCHECK_MSG( IsOpened(), false, _T("must wxDir::Open() first") );

     M_DIR->Rewind();
     M_DIR->SetFileSpec(rsFilespec);
     M_DIR->SetFlags(nFlags);
     M_DIR->Rewind();
     M_DIR->SetFileSpec(rsFilespec);
     M_DIR->SetFlags(nFlags);


@@ -399,8 +395,8 @@ bool wxDir::GetNext(
   wxString*                         psFilename
 ) const
 {
   wxString*                         psFilename
 ) const
 {

-    wxCHECK_MSG( IsOpened(), FALSE, _T("must wxDir::Open() first") );
-    wxCHECK_MSG( psFilename, FALSE, _T("bad pointer in wxDir::GetNext()") );
+    wxCHECK_MSG( IsOpened(), false, _T("must wxDir::Open() first") );
+    wxCHECK_MSG( psFilename, false, _T("bad pointer in wxDir::GetNext()") );

     return M_DIR->Read(psFilename);
 } // end of wxDir::GetNext
 
     return M_DIR->Read(psFilename);
 } // end of wxDir::GetNext