wxMGL compilation fixes

[wxWidgets.git] / src / common / filesys.cpp

diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp
index 4213f32dc4e48a190ae1c1a39cc10f32883a08af..648130d0014d6a3b41b9f5d7cc5238330cede6a5 100644 (file)
--- a/src/common/filesys.cpp
+++ b/src/common/filesys.cpp
@@ -7,7 +7,7 @@
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "filesys.h"
 #endif
 
 #pragma implementation "filesys.h"
 #endif
 


@@ -28,7 +28,6 @@
 #include "wx/log.h"
 
 
 #include "wx/log.h"
 
 

-

 //--------------------------------------------------------------------------------
 // wxFileSystemHandler
 //--------------------------------------------------------------------------------
 //--------------------------------------------------------------------------------
 // wxFileSystemHandler
 //--------------------------------------------------------------------------------


@@ -323,7 +322,7 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
     unsigned i, ln;
     char meta;
     wxFSFile *s = NULL;
     unsigned i, ln;
     char meta;
     wxFSFile *s = NULL;

-    wxNode *node;
+    wxList::compatibility_iterator node;

 
     ln = loc.Length();
     meta = 0;
 
     ln = loc.Length();
     meta = 0;


@@ -377,7 +376,7 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
 
 wxString wxFileSystem::FindFirst(const wxString& spec, int flags)
 {
 
 wxString wxFileSystem::FindFirst(const wxString& spec, int flags)
 {

-    wxNode *node;
+    wxList::compatibility_iterator node;

     wxString spec2(spec);
 
     m_FindFileHandler = NULL;
     wxString spec2(spec);
 
     m_FindFileHandler = NULL;


@@ -424,8 +423,7 @@ void wxFileSystem::AddHandler(wxFileSystemHandler *handler)
 
 void wxFileSystem::CleanUpHandlers()
 {
 
 void wxFileSystem::CleanUpHandlers()
 {

-    m_Handlers.DeleteContents(TRUE);
-    m_Handlers.Clear();
+    WX_CLEAR_LIST(wxList, m_Handlers);

 }
 
 const static wxString g_unixPathString(wxT("/"));
 }
 
 const static wxString g_unixPathString(wxT("/"));