don't break lines in the middle of word

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

diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp
index e86b88cea1a0995b32f1163808fa80a73397b062..c1e307042324ba32caa2f66e5fecd0fd843ec586 100644 (file)
--- a/src/common/filesys.cpp
+++ b/src/common/filesys.cpp
@@ -28,7 +28,6 @@
 #include "wx/log.h"
 
 
 #include "wx/log.h"
 
 

-

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


@@ -190,8 +189,11 @@ wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString&
     return new wxFSFile(new wxFFileInputStream(fullpath),
                         right,
                         GetMimeTypeFromExt(location),
     return new wxFSFile(new wxFFileInputStream(fullpath),
                         right,
                         GetMimeTypeFromExt(location),

-                        GetAnchor(location),
-                        wxDateTime(wxFileModificationTime(fullpath)));
+                        GetAnchor(location)
+#if wxUSE_DATETIME
+                        ,wxDateTime(wxFileModificationTime(fullpath))
+#endif // wxUSE_DATETIME
+                        );

 }
 
 wxString wxLocalFSHandler::FindFirst(const wxString& spec, int flags)
 }
 
 wxString wxLocalFSHandler::FindFirst(const wxString& spec, int flags)


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


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


@@ -421,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("/"));