Output the extracted number from wxString::ToXXX() even if it returns false.

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

diff --git a/src/unix/dir.cpp b/src/unix/dir.cpp
index deab1bee7f89f828c68c97594e5fd805c1f16cb1..31270d04a562d78569fbe871e4b26d52cad55220 100644 (file)
--- a/src/unix/dir.cpp
+++ b/src/unix/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"
 


@@ -95,7 +91,7 @@ wxDirData::wxDirData(const wxString& dirname)
 
     // throw away the trailing slashes
     size_t n = m_dirname.length();
 
     // 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] == '/' )
         ;
 
     while ( n > 0 && m_dirname[--n] == '/' )
         ;


@@ -112,34 +108,34 @@ wxDirData::~wxDirData()
     {
         if ( closedir(m_dir) != 0 )
         {
     {
         if ( closedir(m_dir) != 0 )
         {

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

         }
     }
 }
 
 bool wxDirData::Read(wxString *filename)
 {
         }
     }
 }
 
 bool wxDirData::Read(wxString *filename)
 {

-    dirent *de = (dirent *)NULL;    // just to silence compiler warnings
-    bool matches = FALSE;
+    dirent *de = NULL;    // just to silence compiler warnings
+    bool matches = false;

 
     // speed up string concatenation in the loop a bit
     wxString path = m_dirname;
 
     // speed up string concatenation in the loop a bit
     wxString path = m_dirname;

-    path += _T('/');
+    path += wxT('/');

     path.reserve(path.length() + 255);
     path.reserve(path.length() + 255);

-    
+

     wxString de_d_name;
 
     while ( !matches )
     {
         de = readdir(m_dir);
         if ( !de )
     wxString de_d_name;
 
     while ( !matches )
     {
         de = readdir(m_dir);
         if ( !de )

-            return FALSE;
-            
+            return false;
+

 #if wxUSE_UNICODE
 #if wxUSE_UNICODE

-        de_d_name = wxConvLibc.cMB2WC( de->d_name );
+        de_d_name = wxString(de->d_name, *wxConvFileName);

 #else
         de_d_name = de->d_name;
 #else
         de_d_name = de->d_name;

-#endif            
+#endif

 
         // don't return "." and ".." unless asked for
         if ( de->d_name[0] == '.' &&
 
         // don't return "." and ".." unless asked for
         if ( de->d_name[0] == '.' &&


@@ -168,7 +164,7 @@ bool wxDirData::Read(wxString *filename)
         // finally, check the name
         if ( m_filespec.empty() )
         {
         // finally, check the name
         if ( m_filespec.empty() )
         {

-            matches = m_flags & wxDIR_HIDDEN ? TRUE : de->d_name[0] != '.';
+            matches = m_flags & wxDIR_HIDDEN ? true : de->d_name[0] != '.';

         }
         else
         {
         }
         else
         {


@@ -180,14 +176,14 @@ bool wxDirData::Read(wxString *filename)
 
     *filename = de_d_name;
 
 
     *filename = de_d_name;
 

-    return TRUE;
+    return true;

 }
 
 #else // old VMS (TODO)
 
 wxDirData::wxDirData(const wxString& WXUNUSED(dirname))
 {
 }
 
 #else // old VMS (TODO)
 
 wxDirData::wxDirData(const wxString& WXUNUSED(dirname))
 {

-    wxFAIL_MSG(_T("not implemented"));
+    wxFAIL_MSG(wxT("not implemented"));

 }
 
 wxDirData::~wxDirData()
 }
 
 wxDirData::~wxDirData()


@@ -196,7 +192,7 @@ wxDirData::~wxDirData()
 
 bool wxDirData::Read(wxString * WXUNUSED(filename))
 {
 
 bool wxDirData::Read(wxString * WXUNUSED(filename))
 {

-    return FALSE;
+    return false;

 }
 
 #endif // not or new VMS/old VMS
 }
 
 #endif // not or new VMS/old VMS


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

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

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


@@ -229,16 +225,13 @@ bool wxDir::Open(const wxString& dirname)
 
     if ( !M_DIR->IsOk() )
     {
 
     if ( !M_DIR->IsOk() )
     {

-        wxLogSysError(_("Can not enumerate files in directory '%s'"),
-                      dirname.c_str());
-

         delete M_DIR;
         m_data = NULL;
 
         delete M_DIR;
         m_data = NULL;
 

-        return FALSE;
+        return false;

     }
 
     }
 

-    return TRUE;
+    return true;

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


@@ -252,7 +245,7 @@ wxString wxDir::GetName() const
     if ( m_data )
     {
         name = M_DIR->GetName();
     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);
         {
             // chop off the last (back)slash
             name.Truncate(name.length() - 1);


@@ -275,7 +268,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, wxT("must wxDir::Open() first") );

 
     M_DIR->Rewind();
 
 
     M_DIR->Rewind();
 


@@ -287,16 +280,16 @@ 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, wxT("must wxDir::Open() first") );

 
 

-    wxCHECK_MSG( filename, FALSE, _T("bad pointer in wxDir::GetNext()") );
+    wxCHECK_MSG( filename, false, wxT("bad pointer in wxDir::GetNext()") );

 
     return M_DIR->Read(filename);
 }
 
 
     return M_DIR->Read(filename);
 }
 

-bool wxDir::HasSubDirs(const wxString& spec)
+bool wxDir::HasSubDirs(const wxString& spec) const

 {
 {

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

 
     if ( spec.empty() )
     {
 
     if ( spec.empty() )
     {


@@ -317,7 +310,7 @@ bool wxDir::HasSubDirs(const wxString& spec)
             {
                 case 2:
                     // just "." and ".."
             {
                 case 2:
                     // just "." and ".."

-                    return FALSE;
+                    return false;

 
                 case 0:
                 case 1:
 
                 case 0:
                 case 1:


@@ -329,7 +322,7 @@ bool wxDir::HasSubDirs(const wxString& spec)
                     // assume we have subdirs - may turn out to be wrong if we
                     // have other hard links to this directory but it's not
                     // that bad as explained above
                     // assume we have subdirs - may turn out to be wrong if we
                     // have other hard links to this directory but it's not
                     // that bad as explained above

-                    return TRUE;
+                    return true;

             }
         }
     }
             }
         }
     }