Add a fudge factor to the size of wxODBC in wxProperty under

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

diff --git a/src/unix/dir.cpp b/src/unix/dir.cpp
index 0aeffa42b8576bc44e5e4c00404eb33e5a97b135..16f0b365032ae0528cefe4eb4c83f8c384f0de03 100644 (file)
--- a/src/unix/dir.cpp
+++ b/src/unix/dir.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #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"
 


@@ -120,26 +116,26 @@ wxDirData::~wxDirData()
 bool wxDirData::Read(wxString *filename)
 {
     dirent *de = (dirent *)NULL;    // just to silence compiler warnings
 bool wxDirData::Read(wxString *filename)
 {
     dirent *de = (dirent *)NULL;    // just to silence compiler warnings

-    bool matches = FALSE;
+    bool matches = false;

 
     // speed up string concatenation in the loop a bit
     wxString path = m_dirname;
     path += _T('/');
     path.reserve(path.length() + 255);
 
     // speed up string concatenation in the loop a bit
     wxString path = m_dirname;
     path += _T('/');
     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 = wxConvFileName->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,7 +176,7 @@ bool wxDirData::Read(wxString *filename)
 
     *filename = de_d_name;
 
 
     *filename = de_d_name;
 

-    return TRUE;
+    return true;

 }
 
 #else // old VMS (TODO)
 }
 
 #else // old VMS (TODO)


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

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


@@ -235,10 +231,10 @@ bool wxDir::Open(const wxString& dirname)
         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


@@ -275,7 +271,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();
 


@@ -287,16 +283,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, _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);
 }
 

-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, _T("must wxDir::Open() first") );

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


@@ -317,7 +313,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 +325,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;

             }
         }
     }
             }
         }
     }