Implement icon text column using native GTK renderers in wxDVC.

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

diff --git a/src/os2/dir.cpp b/src/os2/dir.cpp
index 9bb20871624a703e86945058e82b061dc11c4581..f0ec71d6706c2f6fe231d7a1900dbd495ced6900 100644 (file)
--- a/src/os2/dir.cpp
+++ b/src/os2/dir.cpp
@@ -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"
 


@@ -66,7 +62,7 @@ static inline void FreeFindData(
 {
     if (!::DosFindClose(vFd))
     {
 {
     if (!::DosFindClose(vFd))
     {

-        wxLogLastError(_T("DosFindClose"));
+        wxLogLastError(wxT("DosFindClose"));

     }
 }
 
     }
 }
 


@@ -81,7 +77,7 @@ static inline FIND_DATA FindFirst(
 
     rc = ::DosFindFirst( rsSpec.c_str()
                         ,&hDir
 
     rc = ::DosFindFirst( rsSpec.c_str()
                         ,&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)


@@ -227,19 +223,19 @@ bool wxDirData::Read(
 
         if ( !wxEndsWithPathSeparator(sFilespec) )
         {
 
         if ( !wxEndsWithPathSeparator(sFilespec) )
         {

-            sFilespec += _T('\\');
+            sFilespec += wxT('\\');

         }
         }

-        sFilespec += (!m_sFilespec ? _T("*.*") : m_sFilespec.c_str());
+        sFilespec += (!m_sFilespec ? wxT("*.*") : m_sFilespec.c_str());

 
         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;

             }
         }
 
             }
         }
 


@@ -267,9 +263,9 @@ bool wxDirData::Read(
         //
         // Don't return "." and ".." unless asked for
         //
         //
         // Don't return "." and ".." unless asked for
         //

-        if ( zName[0] == _T('.') &&
-             ((zName[1] == _T('.') && zName[2] == _T('\0')) ||
-              (zName[1] == _T('\0'))) )
+        if ( zName[0] == wxT('.') &&
+             ((zName[1] == wxT('.') && zName[2] == wxT('\0')) ||
+              (zName[1] == wxT('\0'))) )

         {
             if (!(m_nFlags & wxDIR_DOTDOT))
                 continue;
         {
             if (!(m_nFlags & wxDIR_DOTDOT))
                 continue;


@@ -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


@@ -360,9 +356,9 @@ wxString wxDir::GetName() const
         if ( !name.empty() )
         {
             // bring to canonical Windows form
         if ( !name.empty() )
         {
             // bring to canonical Windows form

-            name.Replace(_T("/"), _T("\\"));
+            name.Replace(wxT("/"), wxT("\\"));

 
 

-            if ( name.Last() == _T('\\') )
+            if ( name.Last() == wxT('\\') )

             {
                 // chop off the last (back)slash
                 name.Truncate(name.length() - 1);
             {
                 // chop off the last (back)slash
                 name.Truncate(name.length() - 1);


@@ -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, wxT("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, wxT("must wxDir::Open() first") );
+    wxCHECK_MSG( psFilename, false, wxT("bad pointer in wxDir::GetNext()") );

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