Deprecate wxPathExists, make wxDirExists used everywhere, minor source cleaning.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33350 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/utils/wxrcedit/nodesdb.cpp b/contrib/utils/wxrcedit/nodesdb.cpp
index df04e458ff6fdbe08e90339fadddd0c74ffdb2b2..3612e1d33494fbb4816d925fa06f64fff6c38b72 100644 (file)
--- a/contrib/utils/wxrcedit/nodesdb.cpp
+++ b/contrib/utils/wxrcedit/nodesdb.cpp
@@ -49,7 +49,7 @@ void NodeInfo::Read(const wxString& filename, wxPathList& list)
 
     for (size_t i = 0; i < tf.GetLineCount(); i++)
     {
 
     for (size_t i = 0; i < tf.GetLineCount(); i++)
     {

-        if (tf[i].IsEmpty() || tf[i][0u] == _T('#')) continue;
+        if (tf[i].empty() || tf[i][0u] == _T('#')) continue;

         wxStringTokenizer tkn(tf[i], _T(' '));
         wxString s = tkn.GetNextToken();
         if (s == _T("node"))
         wxStringTokenizer tkn(tf[i], _T(' '));
         wxString s = tkn.GetNextToken();
         if (s == _T("node"))


@@ -153,7 +153,7 @@ void NodesDb::Load()
 
 void NodesDb::LoadDir(const wxString& path)
 {
 
 void NodesDb::LoadDir(const wxString& path)
 {

-    if (!wxPathExists(path)) return;
+    if (!wxDirExists(path)) return;

 
     wxDir dir(path);
     wxString filename;
 
     wxDir dir(path);
     wxString filename;

diff --git a/docs/changes.txt b/docs/changes.txt
index 290f75ec69e09d0edfcb89d8e81c36f7413eb79c..9e3ced041a0b2d0c617e3b20396b193f4abe7bb6 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -2,6 +2,13 @@
 wxWidgets 2.5 Change Log - For more verbose changes, see the manual
 -------------------------------------------------------------------
 
 wxWidgets 2.5 Change Log - For more verbose changes, see the manual
 -------------------------------------------------------------------
 

+2.6
+-----
+
+All:
+
+- wxPathExists deprecated, use wxDirExists instead.
+

 2.5.5
 -----
 
 2.5.5
 -----
 


@@ -121,8 +128,8 @@ All:
 - wxGetPowerType() and wxGetBatteryState() addition
 - wxSystemSettings::GetSystem*() members deprecated and replaced with
   wxSystemSettings::Get*()
 - wxGetPowerType() and wxGetBatteryState() addition
 - wxSystemSettings::GetSystem*() members deprecated and replaced with
   wxSystemSettings::Get*()

-- wxWindowBase::DoGetBestSize now includes the difference (if any) between 
-  the client size and total size of the window.  Code that sets the 
+- wxWindowBase::DoGetBestSize now includes the difference (if any) between
+  the client size and total size of the window.  Code that sets the

   client size using the best size, or that added extra space to sizers
   to compensate for this bug may need to be changed.
 - Changed calculation of scrolling area to not clip away some bits
   client size using the best size, or that added extra space to sizers
   to compensate for this bug may need to be changed.
 - Changed calculation of scrolling area to not clip away some bits

diff --git a/docs/latex/wx/function.tex b/docs/latex/wx/function.tex
index 42069bf337a92e477d03b83dc1c102e4b16ba5a1..f9741e745bc41dbcc37cea8888b2a36d27f4bdb0 100644 (file)
--- a/docs/latex/wx/function.tex
+++ b/docs/latex/wx/function.tex
@@ -190,7 +190,7 @@ the corresponding topic.
 \helpref{wxOnAssert}{wxonassert}\\
 \helpref{wxOpenClipboard}{wxopenclipboard}\\
 \helpref{wxParseCommonDialogsFilter}{wxparsecommondialogsfilter}\\
 \helpref{wxOnAssert}{wxonassert}\\
 \helpref{wxOpenClipboard}{wxopenclipboard}\\
 \helpref{wxParseCommonDialogsFilter}{wxparsecommondialogsfilter}\\

-\helpref{wxPathExists}{functionwxpathexists}\\
+\helpref{wxDirExists}{functionwxdirexists}\\

 \helpref{wxPathOnly}{wxpathonly}\\
 \helpref{wxPostDelete}{wxpostdelete}\\
 \helpref{wxPostEvent}{wxpostevent}\\
 \helpref{wxPathOnly}{wxpathonly}\\
 \helpref{wxPostDelete}{wxpostdelete}\\
 \helpref{wxPostEvent}{wxpostevent}\\


@@ -1048,9 +1048,9 @@ Returns true if the argument is an absolute filename, i.e. with a slash
 or drive name at the beginning.
 
 
 or drive name at the beginning.
 
 

-\membersection{::wxPathExists}\label{functionwxpathexists}
+\membersection{::wxDirExists}\label{functionwxdirexists}

 
 

-\func{bool}{wxPathExists}{\param{const wxString\& }{dirname}}
+\func{bool}{wxDirExists}{\param{const wxString\& }{dirname}}

 
 Returns true if the path exists.
 
 
 Returns true if the path exists.
 

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index d1a8a27b65767d6c779a234134291666fcd86700..3014c6937753739393965f19d87fb0cecdfaf69e 100644 (file)
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -367,7 +367,7 @@ const int wxInvalidOffset = -1;
 WXDLLIMPEXP_BASE bool wxFileExists(const wxString& filename);
 
 // does the path exist? (may have or not '/' or '\\' at the end)
 WXDLLIMPEXP_BASE bool wxFileExists(const wxString& filename);
 
 // does the path exist? (may have or not '/' or '\\' at the end)

-WXDLLIMPEXP_BASE bool wxPathExists(const wxChar *pszPathName);
+WXDLLIMPEXP_BASE bool wxDirExists(const wxChar *pszPathName);

 
 WXDLLIMPEXP_BASE bool wxIsAbsolutePath(const wxString& filename);
 
 
 WXDLLIMPEXP_BASE bool wxIsAbsolutePath(const wxString& filename);
 


@@ -462,7 +462,14 @@ WXDLLIMPEXP_BASE wxFileKind wxGetFileKind(int fd);
 WXDLLIMPEXP_BASE wxFileKind wxGetFileKind(FILE *fp);
 
 // compatibility defines, don't use in new code
 WXDLLIMPEXP_BASE wxFileKind wxGetFileKind(FILE *fp);
 
 // compatibility defines, don't use in new code

-#define wxDirExists wxPathExists
+// consider removal droping 2.4 compatibility
+// #if WXWIN_COMPATIBILITY_2_4
+wxDEPRECATED( inline bool wxPathExists(const wxChar *pszPathName) );
+inline bool wxPathExists(const wxChar *pszPathName)
+{
+    return wxDirExists(pszPathName);
+}
+// #endif //WXWIN_COMPATIBILITY_2_4

 
 // ----------------------------------------------------------------------------
 // separators in file names
 
 // ----------------------------------------------------------------------------
 // separators in file names

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 2d28e3ac96b73efce806c5bc9e285d661a117414..37df0c74dbd9da9bfa670c4d20fb1697f929bd84 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -1195,7 +1195,7 @@ bool wxRmdir(const wxString& dir, int WXUNUSED(flags))
 }
 
 // does the path exists? (may have or not '/' or '\\' at the end)
 }
 
 // does the path exists? (may have or not '/' or '\\' at the end)

-bool wxPathExists(const wxChar *pszPathName)
+bool wxDirExists(const wxChar *pszPathName)

 {
     wxString strPath(pszPathName);
 
 {
     wxString strPath(pszPathName);
 

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index c85163a67c824c48b52fd9ec5d16aeb5bd32a1c0..0e3bbb253b3195f49716637e6e2cc200db185c89 100644 (file)
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -527,7 +527,7 @@ bool wxFileName::DirExists() const
 
 bool wxFileName::DirExists( const wxString &dir )
 {
 
 bool wxFileName::DirExists( const wxString &dir )
 {

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

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

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index 33941724771f36876db5d05e3e7eef657710fc61..78501d449f1def57eaf9e21bb31e0c1cf460ee6d 100644 (file)
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -259,7 +259,7 @@ bool wxIsDriveAvailable(const wxString& dirName)
         //     like it when MS-DOS app accesses empty floppy drive
         return (dirNameLower[0u] == wxT('a') ||
                 dirNameLower[0u] == wxT('b') ||
         //     like it when MS-DOS app accesses empty floppy drive
         return (dirNameLower[0u] == wxT('a') ||
                 dirNameLower[0u] == wxT('b') ||

-                wxPathExists(dirNameLower));
+                wxDirExists(dirNameLower));

     }
     else
 #endif
     }
     else
 #endif


@@ -318,7 +318,7 @@ bool wxIsDriveAvailable(const wxString& dirName)
     {
         wxString dirNameLower(dirName.Lower());
 #if defined(__GNUWIN32__) && !(defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1)
     {
         wxString dirNameLower(dirName.Lower());
 #if defined(__GNUWIN32__) && !(defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1)

-        success = wxPathExists(dirNameLower);
+        success = wxDirExists(dirNameLower);

 #else
         #if defined(__OS2__)
         // Avoid changing to drive since no media may be inserted.
 #else
         #if defined(__OS2__)
         // Avoid changing to drive since no media may be inserted.

diff --git a/src/generic/dirdlgg.cpp b/src/generic/dirdlgg.cpp
index 124e7ae05530fd7b032a5e06fd81ed253414a072..388d93fefdee6e39f0a2d535225345a9f3a49e55 100644 (file)
--- a/src/generic/dirdlgg.cpp
+++ b/src/generic/dirdlgg.cpp
@@ -216,7 +216,7 @@ void wxGenericDirDialog::OnOK(wxCommandEvent& WXUNUSED(event))
 {
     m_path = m_input->GetValue();
     // Does the path exist? (User may have typed anything in m_input)
 {
     m_path = m_input->GetValue();
     // Does the path exist? (User may have typed anything in m_input)

-    if (wxPathExists(m_path)) {
+    if (wxDirExists(m_path)) {

         // OK, path exists, we're done.
         EndModal(wxID_OK);
         return;
         // OK, path exists, we're done.
         EndModal(wxID_OK);
         return;


@@ -320,7 +320,7 @@ void wxGenericDirDialog::OnNew( wxCommandEvent& WXUNUSED(event) )
     if (!wxEndsWithPathSeparator(path))
         path += wxFILE_SEP_PATH;
     path += new_name;
     if (!wxEndsWithPathSeparator(path))
         path += wxFILE_SEP_PATH;
     path += new_name;

-    if (wxPathExists(path))
+    if (wxDirExists(path))

     {
         // try NewName0, NewName1 etc.
         int i = 0;
     {
         // try NewName0, NewName1 etc.
         int i = 0;


@@ -335,7 +335,7 @@ void wxGenericDirDialog::OnNew( wxCommandEvent& WXUNUSED(event) )
                 path += wxFILE_SEP_PATH;
             path += new_name;
             i++;
                 path += wxFILE_SEP_PATH;
             path += new_name;
             i++;

-        } while (wxPathExists(path));
+        } while (wxDirExists(path));

     }
 
     wxLogNull log;
     }
 
     wxLogNull log;

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 55da3ff5ff0565559ef9c597504e38f853af5a73..638c1173f1367343d0816817f763e74069939be7 100644 (file)
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -695,7 +695,7 @@ void wxFileCtrl::GoToHomeDir()
 
 void wxFileCtrl::GoToDir( const wxString &dir )
 {
 
 void wxFileCtrl::GoToDir( const wxString &dir )
 {

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

 
     m_dirName = dir;
     UpdateFiles();
 
     m_dirName = dir;
     UpdateFiles();


@@ -1225,7 +1225,7 @@ void wxGenericFileDialog::OnSelected( wxListEvent &event )
     if (!IsTopMostDir(dir))
         dir += wxFILE_SEP_PATH;
     dir += filename;
     if (!IsTopMostDir(dir))
         dir += wxFILE_SEP_PATH;
     dir += filename;

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

 
     ignoreChanges = true;
     m_text->SetValue( filename );
 
     ignoreChanges = true;
     m_text->SetValue( filename );


@@ -1287,7 +1287,7 @@ void wxGenericFileDialog::HandleAction( const wxString &fn )
         filename = dir;
     }
 
         filename = dir;
     }
 

-    if (wxPathExists(filename))
+    if (wxDirExists(filename))

     {
         m_list->GoToDir( filename );
         UpdateControls();
     {
         m_list->GoToDir( filename );
         UpdateControls();

diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp
index 840ae94fa0492c76db07c1b2e60a0acf94787681..49dae623f0f0c7e4d0c752f1dc7ffad14fa89b2e 100644 (file)
--- a/src/generic/helpext.cpp
+++ b/src/generic/helpext.cpp
@@ -259,7 +259,7 @@ bool wxExtHelpController::LoadFile(const wxString& ifile)
       {
          wxString newfile;
          newfile << WXEXTHELP_SEPARATOR << wxGetLocale()->GetName();
       {
          wxString newfile;
          newfile << WXEXTHELP_SEPARATOR << wxGetLocale()->GetName();

-         if(wxPathExists(newfile))
+         if(wxDirExists(newfile))

             file = newfile;
          else
          {
             file = newfile;
          else
          {


@@ -267,13 +267,13 @@ bool wxExtHelpController::LoadFile(const wxString& ifile)
             const wxChar *cptr = wxGetLocale()->GetName().c_str();
             while(*cptr && *cptr != wxT('_'))
                newfile << *(cptr++);
             const wxChar *cptr = wxGetLocale()->GetName().c_str();
             while(*cptr && *cptr != wxT('_'))
                newfile << *(cptr++);

-            if(wxPathExists(newfile))
+            if(wxDirExists(newfile))

                file = newfile;
          }
       }
 #endif
 
                file = newfile;
          }
       }
 #endif
 

-      if(! wxPathExists(file))
+      if(! wxDirExists(file))

          return false;
 
       mapFile << file << WXEXTHELP_SEPARATOR << WXEXTHELP_MAPFILE;
          return false;
 
       mapFile << file << WXEXTHELP_SEPARATOR << WXEXTHELP_MAPFILE;

diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp
index 71d76a691559ad6d21e0faafdcbbedd131d76180..61925cde04bf84eb4764f15b1f8c91f54538b1ca 100644 (file)
--- a/src/gtk/filedlg.cpp
+++ b/src/gtk/filedlg.cpp
@@ -195,7 +195,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
 
         if ( style & wxSAVE )
         {
 
         if ( style & wxSAVE )
         {

-            if ( !defaultDir.IsEmpty() )
+            if ( !defaultDir.empty() )

                 gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget),
                 wxConvFileName->cWX2MB(defaultDir));
 
                 gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget),
                 wxConvFileName->cWX2MB(defaultDir));
 


@@ -204,10 +204,10 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
         }
         else
         {
         }
         else
         {

-            if ( !defaultFileName.IsEmpty() )
+            if ( !defaultFileName.empty() )

             {
                 wxString dir;
             {
                 wxString dir;

-                if ( defaultDir.IsEmpty() )
+                if ( defaultDir.empty() )

                     dir = ::wxGetCwd();
                 else
                     dir = defaultDir;
                     dir = ::wxGetCwd();
                 else
                     dir = defaultDir;


@@ -216,7 +216,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
                     GTK_FILE_CHOOSER(m_widget),
                     wxConvFileName->cWX2MB( wxFileName(dir, defaultFileName).GetFullPath() ) );
             }
                     GTK_FILE_CHOOSER(m_widget),
                     wxConvFileName->cWX2MB( wxFileName(dir, defaultFileName).GetFullPath() ) );
             }

-            else if ( !defaultDir.IsEmpty() )
+            else if ( !defaultDir.empty() )

                 gtk_file_chooser_set_current_folder( GTK_FILE_CHOOSER(m_widget),
                     wxConvFileName->cWX2MB(defaultDir) );
         }
                 gtk_file_chooser_set_current_folder( GTK_FILE_CHOOSER(m_widget),
                     wxConvFileName->cWX2MB(defaultDir) );
         }


@@ -354,7 +354,7 @@ void wxFileDialog::SetDirectory(const wxString& dir)
 #ifdef __WXGTK24__
     if (!gtk_check_version(2,4,0))
     {
 #ifdef __WXGTK24__
     if (!gtk_check_version(2,4,0))
     {

-        if (wxPathExists(dir))
+        if (wxDirExists(dir))

         {
             gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget), wxConvFileName->cWX2MB(dir));
         }
         {
             gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget), wxConvFileName->cWX2MB(dir));
         }

diff --git a/src/gtk1/filedlg.cpp b/src/gtk1/filedlg.cpp
index 71d76a691559ad6d21e0faafdcbbedd131d76180..61925cde04bf84eb4764f15b1f8c91f54538b1ca 100644 (file)
--- a/src/gtk1/filedlg.cpp
+++ b/src/gtk1/filedlg.cpp
@@ -195,7 +195,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
 
         if ( style & wxSAVE )
         {
 
         if ( style & wxSAVE )
         {

-            if ( !defaultDir.IsEmpty() )
+            if ( !defaultDir.empty() )

                 gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget),
                 wxConvFileName->cWX2MB(defaultDir));
 
                 gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget),
                 wxConvFileName->cWX2MB(defaultDir));
 


@@ -204,10 +204,10 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
         }
         else
         {
         }
         else
         {

-            if ( !defaultFileName.IsEmpty() )
+            if ( !defaultFileName.empty() )

             {
                 wxString dir;
             {
                 wxString dir;

-                if ( defaultDir.IsEmpty() )
+                if ( defaultDir.empty() )

                     dir = ::wxGetCwd();
                 else
                     dir = defaultDir;
                     dir = ::wxGetCwd();
                 else
                     dir = defaultDir;


@@ -216,7 +216,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
                     GTK_FILE_CHOOSER(m_widget),
                     wxConvFileName->cWX2MB( wxFileName(dir, defaultFileName).GetFullPath() ) );
             }
                     GTK_FILE_CHOOSER(m_widget),
                     wxConvFileName->cWX2MB( wxFileName(dir, defaultFileName).GetFullPath() ) );
             }

-            else if ( !defaultDir.IsEmpty() )
+            else if ( !defaultDir.empty() )

                 gtk_file_chooser_set_current_folder( GTK_FILE_CHOOSER(m_widget),
                     wxConvFileName->cWX2MB(defaultDir) );
         }
                 gtk_file_chooser_set_current_folder( GTK_FILE_CHOOSER(m_widget),
                     wxConvFileName->cWX2MB(defaultDir) );
         }


@@ -354,7 +354,7 @@ void wxFileDialog::SetDirectory(const wxString& dir)
 #ifdef __WXGTK24__
     if (!gtk_check_version(2,4,0))
     {
 #ifdef __WXGTK24__
     if (!gtk_check_version(2,4,0))
     {

-        if (wxPathExists(dir))
+        if (wxDirExists(dir))

         {
             gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget), wxConvFileName->cWX2MB(dir));
         }
         {
             gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(m_widget), wxConvFileName->cWX2MB(dir));
         }

diff --git a/src/mac/carbon/dirmac.cpp b/src/mac/carbon/dirmac.cpp
index e9df6eedaccb8606444e262cc720846fd7a13e31..7c3651fd630d5b575e4815f548dc30ced7c0f345 100644 (file)
--- a/src/mac/carbon/dirmac.cpp
+++ b/src/mac/carbon/dirmac.cpp
@@ -34,7 +34,7 @@
 #endif // PCH
 
 #include "wx/dir.h"
 #endif // PCH
 
 #include "wx/dir.h"

-#include "wx/filefn.h"          // for wxPathExists()
+#include "wx/filefn.h"          // for wxDirExists()

 
 #ifndef __DARWIN__
   #include <windows.h>
 
 #ifndef __DARWIN__
   #include <windows.h>


@@ -69,12 +69,12 @@ class wxDirData
 public:
     wxDirData(const wxString& dirname);
     ~wxDirData();
 public:
     wxDirData(const wxString& dirname);
     ~wxDirData();

-    
+

     void Close() ;
     void SetFileSpec(const wxString& filespec) { m_filespec = filespec; }
     void SetFlags(int flags) { m_flags = flags; }
 
     void Close() ;
     void SetFileSpec(const wxString& filespec) { m_filespec = filespec; }
     void SetFlags(int flags) { m_flags = flags; }
 

-    bool Read(wxString *filename); // reads the next 
+    bool Read(wxString *filename); // reads the next

     void Rewind() ;
 
     const wxString& GetName() const { return m_dirname; }
     void Rewind() ;
 
     const wxString& GetName() const { return m_dirname; }


@@ -116,7 +116,7 @@ wxDirData::~wxDirData()
 }
 
 void wxDirData::Close()
 }
 
 void wxDirData::Close()

-{ 
+{

     if ( m_iterator )
     {
         FSCloseIterator( m_iterator ) ;
     if ( m_iterator )
     {
         FSCloseIterator( m_iterator ) ;


@@ -124,13 +124,13 @@ void wxDirData::Close()
     }
 }
 
     }
 }
 

-void wxDirData::Rewind() 
+void wxDirData::Rewind()

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

-{        
+{

     wxString result;
     OSStatus err = noErr ;
     if ( NULL == m_iterator )
     wxString result;
     OSStatus err = noErr ;
     if ( NULL == m_iterator )


@@ -139,17 +139,17 @@ bool wxDirData::Read(wxString *filename)
         err = wxMacPathToFSRef( m_dirname , &dirRef ) ;
         if ( err == noErr )
         {
         err = wxMacPathToFSRef( m_dirname , &dirRef ) ;
         if ( err == noErr )
         {

-           err = FSOpenIterator(&dirRef, kFSIterateFlat, &m_iterator);
-       }
-       if ( err )
-       {
-           Close() ;
-           return FALSE ;
-       }
+            err = FSOpenIterator(&dirRef, kFSIterateFlat, &m_iterator);
+        }
+        if ( err )
+        {
+            Close() ;
+            return false ;
+        }

     }
     }

-    
+

     wxString name ;
     wxString name ;

-    
+

     while( noErr == err )
     {
         HFSUniStr255 uniname ;
     while( noErr == err )
     {
         HFSUniStr255 uniname ;


@@ -160,12 +160,12 @@ bool wxDirData::Read(wxString *filename)
         err = FSGetCatalogInfoBulk( m_iterator, 1, &fetched, NULL, kFSCatInfoNodeFlags | kFSCatInfoFinderInfo , &catalogInfo , &fileRef, NULL, &uniname );
         if ( errFSNoMoreItems == err )
             return false ;
         err = FSGetCatalogInfoBulk( m_iterator, 1, &fetched, NULL, kFSCatInfoNodeFlags | kFSCatInfoFinderInfo , &catalogInfo , &fileRef, NULL, &uniname );
         if ( errFSNoMoreItems == err )
             return false ;

-            
+

         wxASSERT( noErr == err ) ;
         wxASSERT( noErr == err ) ;

-        
+

         if ( noErr != err )
             break ;
         if ( noErr != err )
             break ;

-                
+

         name = wxMacHFSUniStrToString( &uniname ) ;
 
         if ( ( name == wxT(".") || name == wxT("..") ) && !(m_flags & wxDIR_DOTDOT) )
         name = wxMacHFSUniStrToString( &uniname ) ;
 
         if ( ( name == wxT(".") || name == wxT("..") ) && !(m_flags & wxDIR_DOTDOT) )


@@ -176,7 +176,7 @@ bool wxDirData::Read(wxString *filename)
 
         if ( (((FileInfo*)&catalogInfo.finderInfo)->finderFlags & kIsInvisible ) && !(m_flags & wxDIR_HIDDEN ) )
             continue ;
 
         if ( (((FileInfo*)&catalogInfo.finderInfo)->finderFlags & kIsInvisible ) && !(m_flags & wxDIR_HIDDEN ) )
             continue ;

-        
+

         // its a dir and we don't want it
         if ( (catalogInfo.nodeFlags & kFSNodeIsDirectoryMask)  && !(m_flags & wxDIR_DIRS) )
             continue ;
         // its a dir and we don't want it
         if ( (catalogInfo.nodeFlags & kFSNodeIsDirectoryMask)  && !(m_flags & wxDIR_DIRS) )
             continue ;


@@ -184,24 +184,24 @@ bool wxDirData::Read(wxString *filename)
         // its a file but we don't want it
         if ( (catalogInfo.nodeFlags & kFSNodeIsDirectoryMask) == 0  && !(m_flags & wxDIR_FILES ) )
             continue ;
         // its a file but we don't want it
         if ( (catalogInfo.nodeFlags & kFSNodeIsDirectoryMask) == 0  && !(m_flags & wxDIR_FILES ) )
             continue ;

-                    
-        if ( m_filespec.IsEmpty() || m_filespec == wxT("*.*") || m_filespec == wxT("*") )
+
+        if ( m_filespec.empty() || m_filespec == wxT("*.*") || m_filespec == wxT("*") )

         {
         }
         {
         }

-        else if ( !wxMatchWild(m_filespec, name , FALSE) )
+        else if ( !wxMatchWild(m_filespec, name , false) )

         {
             continue ;
         }
         {
             continue ;
         }

-        
+

         break ;
     }
     if ( err != noErr )
     {
         break ;
     }
     if ( err != noErr )
     {

-        return FALSE ;
+        return false ;

     }
     }

-    
+

     *filename = name ;
     *filename = name ;

-    return TRUE;
+    return true;

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


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

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

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


@@ -230,7 +230,7 @@ bool wxDir::Open(const wxString& dirname)
     delete M_DIR;
     m_data = new wxDirData(dirname);
 
     delete M_DIR;
     m_data = new wxDirData(dirname);
 

-    return TRUE;
+    return true;

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


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


@@ -282,9 +282,9 @@ 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);
 }

diff --git a/src/mac/classic/dirmac.cpp b/src/mac/classic/dirmac.cpp
index 0afc3b5cb3449184dcb1617631f138ce79d80ad0..10587442a01ffb55e60911557a4ba35f1698497e 100644 (file)
--- a/src/mac/classic/dirmac.cpp
+++ b/src/mac/classic/dirmac.cpp
@@ -34,7 +34,7 @@
 #endif // PCH
 
 #include "wx/dir.h"
 #endif // PCH
 
 #include "wx/dir.h"

-#include "wx/filefn.h"          // for wxPathExists()
+#include "wx/filefn.h"          // for wxDirExists()

 
 #ifndef __DARWIN__
   #include <windows.h>
 
 #ifndef __DARWIN__
   #include <windows.h>


@@ -77,7 +77,7 @@ public:
     void SetFileSpec(const wxString& filespec) { m_filespec = filespec; }
     void SetFlags(int flags) { m_flags = flags; }
 
     void SetFileSpec(const wxString& filespec) { m_filespec = filespec; }
     void SetFlags(int flags) { m_flags = flags; }
 

-    bool Read(wxString *filename); // reads the next 
+    bool Read(wxString *filename); // reads the next

     void Rewind() ;
 
     const wxString& GetName() const { return m_dirname; }
     void Rewind() ;
 
     const wxString& GetName() const { return m_dirname; }


@@ -109,9 +109,9 @@ wxDirData::wxDirData(const wxString& dirname)
          : m_dirname(dirname)
 {
     m_ok = false;
          : m_dirname(dirname)
 {
     m_ok = false;

-    
+

     OSErr err;
     OSErr err;

-    
+

     // throw away the trailing slashes
     size_t n = m_dirname.length();
     wxCHECK_RET( n, _T("empty dir name in wxDir") );
     // throw away the trailing slashes
     size_t n = m_dirname.length();
     wxCHECK_RET( n, _T("empty dir name in wxDir") );


@@ -120,14 +120,14 @@ wxDirData::wxDirData(const wxString& dirname)
         ;
 
     m_dirname.Truncate(n + 1);
         ;
 
     m_dirname.Truncate(n + 1);

-    
+

 #ifdef __DARWIN__
     FSRef theRef;
 
     // get the FSRef associated with the POSIX path
     err = FSPathMakeRef((const UInt8 *) m_dirname.c_str(), &theRef, NULL);
     FSGetVRefNum(&theRef, &(m_CPB.hFileInfo.ioVRefNum));
 #ifdef __DARWIN__
     FSRef theRef;
 
     // get the FSRef associated with the POSIX path
     err = FSPathMakeRef((const UInt8 *) m_dirname.c_str(), &theRef, NULL);
     FSGetVRefNum(&theRef, &(m_CPB.hFileInfo.ioVRefNum));

-    
+

     err = FSGetNodeID( &theRef , &m_dirId , &m_isDir ) ;
 #else
     FSSpec fsspec ;
     err = FSGetNodeID( &theRef , &m_dirId , &m_isDir ) ;
 #else
     FSSpec fsspec ;


@@ -151,7 +151,7 @@ wxDirData::~wxDirData()
 {
 }
 
 {
 }
 

-void wxDirData::Rewind() 
+void wxDirData::Rewind()

 {
     m_index = 0 ;
 }
 {
     m_index = 0 ;
 }


@@ -159,12 +159,12 @@ void wxDirData::Rewind()
 bool wxDirData::Read(wxString *filename)
 {
     if ( !m_isDir )
 bool wxDirData::Read(wxString *filename)
 {
     if ( !m_isDir )

-        return FALSE ;
-        
+        return false ;
+

     wxString result;
 
     short err = noErr ;
     wxString result;
 
     short err = noErr ;

-    
+

     while ( err == noErr )
     {
         m_index++ ;
     while ( err == noErr )
     {
         m_index++ ;


@@ -173,7 +173,7 @@ bool wxDirData::Read(wxString *filename)
         err = PBGetCatInfoSync((CInfoPBPtr)&m_CPB);
         if ( err != noErr )
             break ;
         err = PBGetCatInfoSync((CInfoPBPtr)&m_CPB);
         if ( err != noErr )
             break ;

-        
+

         // its hidden but we don't want it
         if ( ( m_CPB.hFileInfo.ioFlFndrInfo.fdFlags & kIsInvisible ) && !(m_flags & wxDIR_HIDDEN) )
             continue ;
         // its hidden but we don't want it
         if ( ( m_CPB.hFileInfo.ioFlFndrInfo.fdFlags & kIsInvisible ) && !(m_flags & wxDIR_HIDDEN) )
             continue ;


@@ -190,13 +190,13 @@ bool wxDirData::Read(wxString *filename)
         //  we have a directory
         if ( ( m_CPB.dirInfo.ioFlAttrib & ioDirMask) != 0 && (m_flags & wxDIR_DIRS) )
             break ;
         //  we have a directory
         if ( ( m_CPB.dirInfo.ioFlAttrib & ioDirMask) != 0 && (m_flags & wxDIR_DIRS) )
             break ;

-        
+

         // its a file but we don't want it
         if ( ( m_CPB.dirInfo.ioFlAttrib & ioDirMask) == 0 && !(m_flags & wxDIR_FILES ) )
             continue ;
         // its a file but we don't want it
         if ( ( m_CPB.dirInfo.ioFlAttrib & ioDirMask) == 0 && !(m_flags & wxDIR_FILES ) )
             continue ;

-        
+

         wxString file = wxMacMakeStringFromPascal( m_name ) ;
         wxString file = wxMacMakeStringFromPascal( m_name ) ;

-        if ( m_filespec.IsEmpty() || m_filespec == wxT("*.*") || m_filespec == wxT("*") )
+        if ( m_filespec.empty() || m_filespec == wxT("*.*") || m_filespec == wxT("*") )

         {
         }
         else if ( m_filespec.Length() > 1 && m_filespec.Left(1) == wxT("*") )
         {
         }
         else if ( m_filespec.Length() > 1 && m_filespec.Left(1) == wxT("*") )


@@ -217,17 +217,17 @@ bool wxDirData::Read(wxString *filename)
         {
             continue ;
         }
         {
             continue ;
         }

-        
+

         break ;
     }
     if ( err != noErr )
     {
         break ;
     }
     if ( err != noErr )
     {

-        return FALSE ;
+        return false ;

     }
     }

-    
+

     *filename = wxMacMakeStringFromPascal( m_name )  ;
 
     *filename = wxMacMakeStringFromPascal( m_name )  ;
 

-    return TRUE;
+    return true;

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


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

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

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


@@ -256,12 +256,12 @@ bool wxDir::Open(const wxString& dirname)
     delete M_DIR;
     m_data = new wxDirData(dirname);
     if (m_data->Ok())
     delete M_DIR;
     m_data = new wxDirData(dirname);
     if (m_data->Ok())

-        return TRUE;
+        return true;

     else
     {
         delete m_data;
         m_data = NULL;
     else
     {
         delete m_data;
         m_data = NULL;

-        return FALSE;
+        return false;

     }
 }
 
     }
 }
 


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


@@ -314,9 +314,9 @@ 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);
 }

diff --git a/src/mgl/dirmgl.cpp b/src/mgl/dirmgl.cpp
index e7c59d21b4eca98171f55c06a237cd756abf150c..b07cd56dc7389c8511a6c5fb577c2373aa97bb24 100644 (file)
--- a/src/mgl/dirmgl.cpp
+++ b/src/mgl/dirmgl.cpp
@@ -109,7 +109,7 @@ wxDirData::~wxDirData()
 void wxDirData::SetFileSpec(const wxString& filespec)
 {
 #ifdef __DOS__
 void wxDirData::SetFileSpec(const wxString& filespec)
 {
 #ifdef __DOS__

-    if ( filespec.IsEmpty() )
+    if ( filespec.empty() )

         m_filespec = _T("*.*");
     else
 #endif
         m_filespec = _T("*.*");
     else
 #endif


@@ -128,10 +128,10 @@ void wxDirData::Rewind()
 bool wxDirData::Read(wxString *filename)
 {
     PM_findData data;
 bool wxDirData::Read(wxString *filename)
 {
     PM_findData data;

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

 
     data.dwSize = sizeof(data);
 
     data.dwSize = sizeof(data);

-    
+

     wxString path = m_dirname;
     path += wxFILE_SEP_PATH;
     path.reserve(path.length() + 255); // speed up string concatenation
     wxString path = m_dirname;
     path += wxFILE_SEP_PATH;
     path.reserve(path.length() + 255); // speed up string concatenation


@@ -141,7 +141,7 @@ bool wxDirData::Read(wxString *filename)
         if ( m_dir )
         {
             if ( !PM_findNextFile(m_dir, &data) )
         if ( m_dir )
         {
             if ( !PM_findNextFile(m_dir, &data) )

-                return FALSE;
+                return false;

         }
         else
         {
         }
         else
         {


@@ -149,7 +149,7 @@ bool wxDirData::Read(wxString *filename)
             if ( m_dir == PM_FILE_INVALID )
             {
                 m_dir = NULL;
             if ( m_dir == PM_FILE_INVALID )
             {
                 m_dir = NULL;

-                return FALSE;
+                return false;

             }
         }
 
             }
         }
 


@@ -177,12 +177,12 @@ bool wxDirData::Read(wxString *filename)
             continue;
         }
 
             continue;
         }
 

-        matches = m_flags & wxDIR_HIDDEN ? TRUE : !(data.attrib & PM_FILE_HIDDEN);
+        matches = m_flags & wxDIR_HIDDEN ? true : !(data.attrib & PM_FILE_HIDDEN);

     }
 
     *filename = data.name;
 
     }
 
     *filename = data.name;
 

-    return TRUE;
+    return true;

 }
 
 
 }
 
 


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

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

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


@@ -211,15 +211,15 @@ bool wxDir::Open(const wxString& dirname)
 {
     delete M_DIR;
     m_data = NULL;
 {
     delete M_DIR;
     m_data = NULL;

-    
+

     if ( !wxDir::Exists(dirname) )
     {
         wxLogError(_("Directory '%s' doesn't exist!"), dirname.c_str());
     if ( !wxDir::Exists(dirname) )
     {
         wxLogError(_("Directory '%s' doesn't exist!"), dirname.c_str());

-        return FALSE;
+        return false;

     }
     }

-    
+

     m_data = new wxDirData(dirname);
     m_data = new wxDirData(dirname);

-    return TRUE;
+    return true;

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


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


@@ -268,9 +268,9 @@ 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);
 }

diff --git a/src/msw/dir.cpp b/src/msw/dir.cpp
index 4240cd09302e2573836a17227aff0bdf7595159e..d13cf27c0bc7a8ef00704ca0042fc116655e2d5a 100644 (file)
--- a/src/msw/dir.cpp
+++ b/src/msw/dir.cpp
@@ -34,7 +34,7 @@
 #endif // PCH
 
 #include "wx/dir.h"
 #endif // PCH
 
 #include "wx/dir.h"

-#include "wx/filefn.h"          // for wxPathExists()
+#include "wx/filefn.h"          // for wxDirExists()

 
 #ifdef __WXMSW__
     #include "wx/msw/private.h"
 
 #ifdef __WXMSW__
     #include "wx/msw/private.h"


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

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

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

diff --git a/src/msw/mslu.cpp b/src/msw/mslu.cpp
index c830ecf70ef3e2d9f54d6dc5665f7143f877d660..f6f373a965cae8e2b10c0c1b17b281e95a136eea 100644 (file)
--- a/src/msw/mslu.cpp
+++ b/src/msw/mslu.cpp
@@ -119,7 +119,7 @@ static void wxFixOPENFILENAME(LPOPENFILENAME ofn)
     if ( (ofn->Flags & OFN_ALLOWMULTISELECT) &&
          ofn->lpstrFile[ofn->nFileOffset-1] != wxT('\0') )
     {
     if ( (ofn->Flags & OFN_ALLOWMULTISELECT) &&
          ofn->lpstrFile[ofn->nFileOffset-1] != wxT('\0') )
     {

-        if ( wxPathExists(ofn->lpstrFile) )
+        if ( wxDirExists(ofn->lpstrFile) )

         {
             // 1st component is dir => multiple files selected
             ofn->nFileOffset = wxStrlen(ofn->lpstrFile)+1;
         {
             // 1st component is dir => multiple files selected
             ofn->nFileOffset = wxStrlen(ofn->lpstrFile)+1;

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


@@ -213,7 +213,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 +234,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 +249,7 @@ bool wxDirData::Read(
     {
         if (bFirst)
         {
     {
         if (bFirst)
         {

-            bFirst = FALSE;
+            bFirst = false;

         }
         else
         {
         }
         else
         {


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

-                return FALSE;
+                return false;

             }
         }
 
             }
         }
 


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

-    return TRUE;
+    return true;

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


@@ -321,7 +321,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 +343,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 +388,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 +399,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
 

diff --git a/src/os2/wx25.def b/src/os2/wx25.def
index c2615d9b06b8006913a9b586e88c61579ef3b5b4..f073efc3c9348dc8787945f430e3724e268e03ac 100644 (file)
--- a/src/os2/wx25.def
+++ b/src/os2/wx25.def
@@ -2299,8 +2299,8 @@ EXPORTS
       wxStripExtension__FPc
       ;wxPathOnly(const wxString&)
       wxPathOnly__FRC8wxString
       wxStripExtension__FPc
       ;wxPathOnly(const wxString&)
       wxPathOnly__FRC8wxString

-      ;wxPathExists(const char*)
-      wxPathExists__FPCc
+      ;wxDirExists(const char*)
+      wxDirExists__FPCc

       ;wxPathList::FindValidPath(const wxString&)
       FindValidPath__10wxPathListFRC8wxString
       ;wxPathList::FindAbsoluteValidPath(const wxString&)
       ;wxPathList::FindValidPath(const wxString&)
       FindValidPath__10wxPathListFRC8wxString
       ;wxPathList::FindAbsoluteValidPath(const wxString&)


@@ -13919,8 +13919,8 @@ EXPORTS
       wxDrawBorder__FUlR6_RECTLT1
       ;wxShutdown(wxShutdownFlags)
       wxShutdown__F15wxShutdownFlags
       wxDrawBorder__FUlR6_RECTLT1
       ;wxShutdown(wxShutdownFlags)
       wxShutdown__F15wxShutdownFlags

-      ;wxPathExists(const wxString&)
-      wxPathExists__FRC8wxString
+      ;wxDirExists(const wxString&)
+      wxDirExists__FRC8wxString

       ;wxGetWindowText(unsigned long)
       wxGetWindowText__FUl
       ;wxGetWindowId(unsigned long)
       ;wxGetWindowText(unsigned long)
       wxGetWindowText__FUl
       ;wxGetWindowId(unsigned long)

diff --git a/src/palmos/dir.cpp b/src/palmos/dir.cpp
index 715d3877477cc71f26e2f978caf2f60952b89568..7ae2827cfd6dc41e2b1dbf752266c0afcc29c093 100644 (file)
--- a/src/palmos/dir.cpp
+++ b/src/palmos/dir.cpp
@@ -34,7 +34,7 @@
 #endif // PCH
 
 #include "wx/dir.h"
 #endif // PCH
 
 #include "wx/dir.h"

-#include "wx/filefn.h"          // for wxPathExists()
+#include "wx/filefn.h"          // for wxDirExists()

 
 // ----------------------------------------------------------------------------
 // define the types and functions used for file searching
 
 // ----------------------------------------------------------------------------
 // define the types and functions used for file searching

diff --git a/src/unix/dir.cpp b/src/unix/dir.cpp
index 0aeffa42b8576bc44e5e4c00404eb33e5a97b135..6907ca9b4a546da23eb26b68b31ccf3671457cf7 100644 (file)
--- a/src/unix/dir.cpp
+++ b/src/unix/dir.cpp
@@ -120,26 +120,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
         de_d_name = wxConvFileName->cMB2WC( de->d_name );
 #else
         de_d_name = de->d_name;
 #if wxUSE_UNICODE
         de_d_name = wxConvFileName->cMB2WC( 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 +168,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 +180,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 +196,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 +208,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 +235,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 +275,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 +287,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);
 }
 
 bool wxDir::HasSubDirs(const wxString& spec)
 {
 
     return M_DIR->Read(filename);
 }
 
 bool wxDir::HasSubDirs(const wxString& spec)
 {

-    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 +317,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 +329,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;

             }
         }
     }
             }
         }
     }

diff --git a/tests/archive/archivetest.cpp b/tests/archive/archivetest.cpp
index dd04edd3aabab7099aa4da7257601dd69db6d4cf..1e09053104273ed24fe4f69f7b755864da8a4a68 100644 (file)
--- a/tests/archive/archivetest.cpp
+++ b/tests/archive/archivetest.cpp
@@ -912,7 +912,7 @@ void ArchiveTestCase<ClassFactoryT>::VerifyDir(wxString& path,
             name = m_factory->GetInternalName(
                     path.substr(rootlen, wxString::npos));
 
             name = m_factory->GetInternalName(
                     path.substr(rootlen, wxString::npos));
 

-            bool isDir = wxPathExists(path);
+            bool isDir = wxDirExists(path);

             if (isDir)
                 name += _T("/");
 
             if (isDir)
                 name += _T("/");