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 b07cd56dc7389c8511a6c5fb577c2373aa97bb24..cc28a6aa594a312865862471e619482391b9551c 100644 (file)
--- a/src/mgl/dirmgl.cpp
+++ b/src/mgl/dirmgl.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxDir implementation for MGL
 // Author:      Vaclav Slavik, Vadim Zeitlin
 // Modified by:
 // Purpose:     wxDir implementation for MGL
 // Author:      Vaclav Slavik, Vadim Zeitlin
 // Modified by:


@@ -10,18 +10,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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


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

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

 
 #ifndef __UNIX__
 
 
 #ifndef __UNIX__
 


@@ -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 ) {}
 


@@ -110,7 +104,7 @@ void wxDirData::SetFileSpec(const wxString& filespec)
 {
 #ifdef __DOS__
     if ( filespec.empty() )
 {
 #ifdef __DOS__
     if ( filespec.empty() )

-        m_filespec = _T("*.*");
+        m_filespec = wxT("*.*");

     else
 #endif
     m_filespec = filespec;
     else
 #endif
     m_filespec = filespec;


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


@@ -268,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__

-