Avoid outputting the assert message twice in non-GUI code.

[wxWidgets.git] / src / mgl / dirmgl.cpp

diff --git a/src/mgl/dirmgl.cpp b/src/mgl/dirmgl.cpp
index b6ce6e5ca0b344b1fa9d6a9e5ee972b11153d73f..cc28a6aa594a312865862471e619482391b9551c 100644 (file)
--- a/src/mgl/dirmgl.cpp
+++ b/src/mgl/dirmgl.cpp
@@ -1,27 +1,15 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        mgl/dir.cpp
+// Name:        src/mgl/dir.cpp

 // Purpose:     wxDir implementation for MGL
 // Author:      Vaclav Slavik, Vadim Zeitlin
 // Modified by:
 // Created:     2001/12/09
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Purpose:     wxDir implementation for MGL
 // Author:      Vaclav Slavik, Vadim Zeitlin
 // Modified by:
 // Created:     2001/12/09
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-//              (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows license
+//              (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// 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"
 


@@ -29,7 +17,13 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/defs.h"
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------

 
 #ifndef __UNIX__
 
 
 #ifndef __UNIX__
 


@@ -61,7 +55,7 @@ public:
 
     bool IsOk() const { return m_dir != NULL; }
 
 
     bool IsOk() const { return m_dir != NULL; }
 

-    void SetFileSpec(const wxString& filespec) { m_filespec = filespec; }
+    void SetFileSpec(const wxString& filespec);

     void SetFlags(int flags) { m_flags = flags; }
 
     void Rewind();
     void SetFlags(int flags) { m_flags = flags; }
 
     void Rewind();


@@ -93,7 +87,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] == wxFILE_SEP_PATH ) {}
 
 
     while ( n > 0 && m_dirname[--n] == wxFILE_SEP_PATH ) {}
 


@@ -106,6 +100,16 @@ wxDirData::~wxDirData()
         PM_findClose(m_dir);
 }
 
         PM_findClose(m_dir);
 }
 

+void wxDirData::SetFileSpec(const wxString& filespec)
+{
+#ifdef __DOS__
+    if ( filespec.empty() )
+        m_filespec = wxT("*.*");
+    else
+#endif
+    m_filespec = filespec;
+}
+

 void wxDirData::Rewind()
 {
     if ( m_dir )
 void wxDirData::Rewind()
 {
     if ( m_dir )


@@ -118,10 +122,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


@@ -131,7 +135,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
         {


@@ -139,7 +143,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;

             }
         }
 
             }
         }
 


@@ -167,12 +171,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;

 }
 
 
 }
 
 


@@ -183,7 +187,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);

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


@@ -201,15 +205,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


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


@@ -258,12 +262,11 @@ 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);
 }
 
 #endif // !__UNIX__
 
     return M_DIR->Read(filename);
 }
 
 #endif // !__UNIX__

-