moved wxIcon implementation for ports where it's identical to wxBitmap to generic...

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

diff --git a/src/mgl/dirmgl.cpp b/src/mgl/dirmgl.cpp
index e7c59d21b4eca98171f55c06a237cd756abf150c..bd6e21b38a2b9019d3a3ea89b9f219ad129da003 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__
 


@@ -109,7 +103,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 +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


@@ -141,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
         {


@@ -149,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;

             }
         }
 
             }
         }
 


@@ -177,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;

 }
 
 
 }
 
 


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

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


@@ -211,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


@@ -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, _T("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, _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);
 }
 
 #endif // !__UNIX__
 
     return M_DIR->Read(filename);
 }
 
 #endif // !__UNIX__

-