Rename delegates to try and stop name clashes, probably with wxWebKitCtrl.

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

diff --git a/src/palmos/dir.cpp b/src/palmos/dir.cpp
index e041f2f001a253c56cab1363c12837e90db4e6ee..6e1d49069dc424748306a88cbbe6f09d14a05df5 100644 (file)
--- a/src/palmos/dir.cpp
+++ b/src/palmos/dir.cpp
@@ -30,7 +30,6 @@
 #endif // PCH
 
 #include "wx/dir.h"
-#include "wx/filefn.h"          // for wxDirExists()
 
 #include "pfall.h"
 
@@ -97,7 +96,7 @@ wxDirData::wxDirData(const wxString& dirname)
 
     // throw away the trailing slashes
     size_t n = m_dirname.length();
-    wxCHECK_RET( n, _T("empty dir name in wxDir") );
+    wxCHECK_RET( n, wxT("empty dir name in wxDir") );
 
     while ( n > 0 && m_dirname[--n] == '/' )
         ;
@@ -119,7 +118,7 @@ void wxDirData::Close()
     {
         if ( svfs_dir_endfind (m_dir) != 0 )
         {
-            wxLogLastError(_T("svfs_dir_endfind"));
+            wxLogLastError(wxT("svfs_dir_endfind"));
         }
         m_dir = NULL;
     }
@@ -127,7 +126,7 @@ void wxDirData::Close()
 
 bool wxDirData::Read(wxString *filename)
 {
-    //dirent *de = (dirent *)NULL;    // just to silence compiler warnings
+    //dirent *de = NULL;    // just to silence compiler warnings
     int ret;
     char tmpbuf[300];
     bool matches = false;
@@ -135,7 +134,7 @@ bool wxDirData::Read(wxString *filename)
 
     // speed up string concatenation in the loop a bit
     wxString path = m_dirname;
-    path += _T('/');
+    path += wxT('/');
     path.reserve(path.length() + 255);
 
     wxString de_d_name;
@@ -198,16 +197,6 @@ bool wxDirData::Read(wxString *filename)
     return true;
 }
 
-// ----------------------------------------------------------------------------
-// wxDir helpers
-// ----------------------------------------------------------------------------
-
-/* static */
-bool wxDir::Exists(const wxString& dir)
-{
-    return wxDirExists(dir);
-}
-
 // ----------------------------------------------------------------------------
 // wxDir construction/destruction
 // ----------------------------------------------------------------------------
@@ -237,7 +226,7 @@ wxString wxDir::GetName() const
     if ( m_data )
     {
         name = M_DIR->GetName();
-        if ( !name.empty() && (name.Last() == _T('/')) )
+        if ( !name.empty() && (name.Last() == wxT('/')) )
         {
             // chop off the last (back)slash
             name.Truncate(name.length() - 1);
@@ -260,7 +249,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, wxT("must wxDir::Open() first") );
     M_DIR->Close();
     M_DIR->SetFileSpec(filespec);
     M_DIR->SetFlags(flags);
@@ -269,8 +258,8 @@ bool wxDir::GetFirst(wxString *filename,
 
 bool wxDir::GetNext(wxString *filename) const
 {
-    wxCHECK_MSG( IsOpened(), false, _T("must wxDir::Open() first") );
-    wxCHECK_MSG( filename, false, _T("bad pointer in wxDir::GetNext()") );
+    wxCHECK_MSG( IsOpened(), false, wxT("must wxDir::Open() first") );
+    wxCHECK_MSG( filename, false, wxT("bad pointer in wxDir::GetNext()") );
     return M_DIR->Read(filename);
 }