toplevel code transferred to wxTopLevelWindow

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

diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp
index 9925521aa3070c818297c818a13568d90462d266..e83909d8477eff8b07a01997e7eddee2f158d49b 100644 (file)
--- a/src/common/filesys.cpp
+++ b/src/common/filesys.cpp
@@ -24,7 +24,7 @@
 #include "wx/module.h"
 #include "wx/filesys.h"
 #include "wx/mimetype.h"
-
+#include "wx/filename.h"
 
 
 
@@ -35,10 +35,13 @@
 IMPLEMENT_ABSTRACT_CLASS(wxFileSystemHandler, wxObject)
 
 
+#if wxUSE_MIMETYPE
 static wxFileTypeInfo *gs_FSMimeFallbacks = NULL;
+#endif
 
 wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
 {
+#if wxUSE_MIMETYPE
     wxString ext = wxEmptyString, mime = wxEmptyString;
     wxString loc = GetRightLocation(location);
     char c;
@@ -67,6 +70,9 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
     delete ft;
 
     return mime;
+#else
+    return wxEmptyString;
+#endif
 }
 
 
@@ -138,15 +144,8 @@ wxString wxFileSystemHandler::FindNext()
 // wxLocalFSHandler
 //--------------------------------------------------------------------------------
 
-class wxLocalFSHandler : public wxFileSystemHandler
-{
-    public:
-        virtual bool CanOpen(const wxString& location);
-        virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location);
-        virtual wxString FindFirst(const wxString& spec, int flags = 0);
-        virtual wxString FindNext();
-};
 
+wxString wxLocalFSHandler::ms_root;
 
 bool wxLocalFSHandler::CanOpen(const wxString& location)
 {
@@ -155,21 +154,24 @@ bool wxLocalFSHandler::CanOpen(const wxString& location)
 
 wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
 {
-    wxString right = GetRightLocation(location);
-    if (!wxFileExists(right))
+    // location has Unix path separators
+    wxString right = ms_root + GetRightLocation(location);
+    wxFileName fn(right, wxPATH_UNIX);
+    
+    if (!wxFileExists(fn.GetFullPath()))
         return (wxFSFile*) NULL;
-
-    return new wxFSFile(new wxFileInputStream(right),
+        
+    return new wxFSFile(new wxFileInputStream(fn.GetFullPath()),
                         right,
                         GetMimeTypeFromExt(location),
                         GetAnchor(location),
-                        wxDateTime(wxFileModificationTime(right)));
+                        wxDateTime(wxFileModificationTime(fn.GetFullPath())));
 
 }
 
 wxString wxLocalFSHandler::FindFirst(const wxString& spec, int flags)
 {
-    wxString right = GetRightLocation(spec);
+    wxString right = ms_root + GetRightLocation(spec);
     return wxFindFirstFile(right, flags);
 }
 
@@ -195,20 +197,20 @@ static wxString MakeCorrectPath(const wxString& path)
     wxString p(path);
     wxString r;
     int i, j, cnt;
-    
+
     cnt = p.Length();
     for (i = 0; i < cnt; i++)
       if (p.GetChar(i) == wxT('\\')) p.GetWritableChar(i) = wxT('/'); // Want to be windows-safe
-        
+
     if (p.Left(2) == wxT("./")) { p = p.Mid(2); cnt -= 2; }
-    
+
     if (cnt < 3) return p;
-    
+
     r << p.GetChar(0) << p.GetChar(1);
-    
+
     // skip trailing ../.., if any
     for (i = 2; i < cnt && (p.GetChar(i) == wxT('/') || p.GetChar(i) == wxT('.')); i++) r << p.GetChar(i);
-    
+
     // remove back references: translate dir1/../dir2 to dir2
     for (; i < cnt; i++)
     {
@@ -223,9 +225,9 @@ static wxString MakeCorrectPath(const wxString& path)
             }
         }
     }
-        
+
     for (; i < cnt; i++) r << p.GetChar(i);
-        
+
     return r;
 }
 
@@ -241,7 +243,7 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
         if (m_Path.Length() > 0 && m_Path.Last() != wxT('/') && m_Path.Last() != wxT(':'))
                m_Path << wxT('/');
     }
-    
+
     else
     {
         for (i = m_Path.Length()-1; i >= 0; i--)
@@ -300,7 +302,7 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
     {
         switch (loc[i])
         {
-            case wxT('/') : case wxT(':') : case wxT('#') : 
+            case wxT('/') : case wxT(':') : case wxT('#') :
                 meta = loc[i];
                 break;
         }
@@ -348,7 +350,7 @@ wxString wxFileSystem::FindFirst(const wxString& spec, int flags)
 {
     wxNode *node;
     wxString spec2(spec);
-    
+
     m_FindFileHandler = NULL;
 
     for (int i = spec2.Length()-1; i >= 0; i--)
@@ -358,10 +360,10 @@ wxString wxFileSystem::FindFirst(const wxString& spec, int flags)
     while (node)
     {
         m_FindFileHandler = (wxFileSystemHandler*) node -> GetData();
-        if (m_FindFileHandler -> CanOpen(m_Path + spec2)) 
+        if (m_FindFileHandler -> CanOpen(m_Path + spec2))
             return m_FindFileHandler -> FindFirst(m_Path + spec2, flags);
         node = node->GetNext();
-    } 
+    }
 
     node = m_Handlers.GetFirst();
     while (node)
@@ -370,9 +372,9 @@ wxString wxFileSystem::FindFirst(const wxString& spec, int flags)
         if (m_FindFileHandler -> CanOpen(spec2))
             return m_FindFileHandler -> FindFirst(spec2, flags);
         node = node->GetNext();
-    } 
-    
-    return wxEmptyString;   
+    }
+
+    return wxEmptyString;
 }
 
 
@@ -410,47 +412,50 @@ class wxFileSystemModule : public wxModule
         virtual bool OnInit()
         {
             wxFileSystem::AddHandler(new wxLocalFSHandler);
-            
+
+        #if wxUSE_MIMETYPE
             gs_FSMimeFallbacks = new wxFileTypeInfo[6];
-            gs_FSMimeFallbacks[0] = 
+            gs_FSMimeFallbacks[0] =
             wxFileTypeInfo("image/jpeg",
                            "",
                            "",
                            "JPEG image (from fallback)",
                            "jpg", "jpeg", NULL);
-            gs_FSMimeFallbacks[1] = 
+            gs_FSMimeFallbacks[1] =
             wxFileTypeInfo("image/gif",
                            "",
                            "",
                            "GIF image (from fallback)",
                            "gif", NULL);
-            gs_FSMimeFallbacks[2] = 
+            gs_FSMimeFallbacks[2] =
             wxFileTypeInfo("image/png",
                            "",
                            "",
                            "PNG image (from fallback)",
                            "png", NULL);
-            gs_FSMimeFallbacks[3] = 
+            gs_FSMimeFallbacks[3] =
             wxFileTypeInfo("image/bmp",
                            "",
                            "",
                            "windows bitmap image (from fallback)",
                            "bmp", NULL);
-            gs_FSMimeFallbacks[4] = 
+            gs_FSMimeFallbacks[4] =
             wxFileTypeInfo("text/html",
                            "",
                            "",
                            "HTML document (from fallback)",
                            "htm", "html", NULL);
-            gs_FSMimeFallbacks[5] = 
+            gs_FSMimeFallbacks[5] =
             // must terminate the table with this!
             wxFileTypeInfo();
-            
+        #endif
             return TRUE;
         }
         virtual void OnExit()
        {
-            delete gs_FSMimeFallbacks;
+        #if wxUSE_MIMETYPE
+            delete [] gs_FSMimeFallbacks;
+        #endif
             wxFileSystem::CleanUpHandlers();
        }
 };