Applied patch [ 602924 ] colours and effects in wxMSW::wxFontDialog

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

diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp
index d154b75f7334a2b9c37e95b150194398f052c8cd..5586e348dccdaf35db4e095dc1e67dd9b9fafae0 100644 (file)
--- a/src/common/filesys.cpp
+++ b/src/common/filesys.cpp
@@ -8,7 +8,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
-#pragma implementation
+#pragma implementation "filesys.h"
 #endif
 
 #include "wx/wxprec.h"
@@ -24,7 +24,7 @@
 #include "wx/module.h"
 #include "wx/filesys.h"
 #include "wx/mimetype.h"
-
+#include "wx/filename.h"
 
 
 
@@ -35,38 +35,61 @@
 IMPLEMENT_ABSTRACT_CLASS(wxFileSystemHandler, wxObject)
 
 
+#if wxUSE_MIMETYPE
 static wxFileTypeInfo *gs_FSMimeFallbacks = NULL;
+#endif
 
 wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
 {
-    wxString ext = wxEmptyString, mime = wxEmptyString;
+    wxString ext, mime;
     wxString loc = GetRightLocation(location);
     char c;
     int l = loc.Length(), l2;
-    wxFileType *ft;
 
     l2 = l;
-    for (int i = l-1; i >= 0; i--) {
+    for (int i = l-1; i >= 0; i--)
+    {
         c = loc[(unsigned int) i];
-        if (c == wxT('#')) l2 = i + 1;
-        if (c == wxT('.')) {ext = loc.Right(l2-i-1); break;}
-        if ((c == wxT('/')) || (c == wxT('\\')) || (c == wxT(':'))) {return wxEmptyString;}
+        if ( c == wxT('#') )
+            l2 = i + 1;
+        if ( c == wxT('.') )
+        {
+            ext = loc.Right(l2-i-1);
+            break;
+        }
+        if ( (c == wxT('/')) || (c == wxT('\\')) || (c == wxT(':')) )
+            return wxEmptyString;
     }
 
+#if wxUSE_MIMETYPE
     static bool s_MinimalMimeEnsured = FALSE;
     if (!s_MinimalMimeEnsured) {
-        wxTheMimeTypesManager -> AddFallbacks(gs_FSMimeFallbacks);
+        wxTheMimeTypesManager->AddFallbacks(gs_FSMimeFallbacks);
         s_MinimalMimeEnsured = TRUE;
     }
 
-    ft = wxTheMimeTypesManager -> GetFileTypeFromExtension(ext);
-    if ( !ft || !ft -> GetMimeType(&mime) ) {
+    wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(ext);
+    if ( !ft || !ft -> GetMimeType(&mime) )
+    {
         mime = wxEmptyString;
     }
 
     delete ft;
 
     return mime;
+#else
+    if ( ext.IsSameAs(wxT("htm"), FALSE) || ext.IsSameAs(_T("html"), FALSE) )
+        return wxT("text/html");
+    if ( ext.IsSameAs(wxT("jpg"), FALSE) || ext.IsSameAs(_T("jpeg"), FALSE) )
+        return wxT("image/jpeg");
+    if ( ext.IsSameAs(wxT("gif"), FALSE) )
+        return wxT("image/gif");
+    if ( ext.IsSameAs(wxT("png"), FALSE) )
+        return wxT("image/png");
+    if ( ext.IsSameAs(wxT("bmp"), FALSE) )
+        return wxT("image/bmp");
+    return wxEmptyString;
+#endif
 }
 
 
@@ -138,15 +161,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,33 +171,24 @@ bool wxLocalFSHandler::CanOpen(const wxString& location)
 
 wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
 {
-    wxString right = GetRightLocation(location);
- #ifdef __WXMAC__
-    if ( right[0] != '.' && right[0] != '/' && right.Find( '/' ) != wxNOT_FOUND ) {
-      right = "./" + right ;
-    }
-    right = wxUnix2MacFilename( right ) ;
- #endif
-    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 wxFFileInputStream(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);
- #ifdef __WXMAC__
-    if ( right[0] != '.' && right[0] != '/' && right.Find( '/' ) != wxNOT_FOUND ) {
-      right = "./" + right ;
-    }
-    right = wxUnix2MacFilename( right ) ;
- #endif
+    wxString right = ms_root + GetRightLocation(spec);
     return wxFindFirstFile(right, flags);
 }
 
@@ -197,6 +204,7 @@ wxString wxLocalFSHandler::FindNext()
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileSystem, wxObject)
+IMPLEMENT_ABSTRACT_CLASS(wxFSFile, wxObject)
 
 
 wxList wxFileSystem::m_Handlers;
@@ -251,22 +259,22 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
     if (is_dir)
     {
         if (m_Path.Length() > 0 && m_Path.Last() != wxT('/') && m_Path.Last() != wxT(':'))
-               m_Path << wxT('/');
+            m_Path << wxT('/');
     }
 
     else
     {
         for (i = m_Path.Length()-1; i >= 0; i--)
-       {
+        {
             if (m_Path[(unsigned int) i] == wxT('/'))
-               {
+            {
                 if ((i > 1) && (m_Path[(unsigned int) (i-1)] == wxT('/')) && (m_Path[(unsigned int) (i-2)] == wxT(':')))
-                       {
+                {
                     i -= 2;
                     continue;
                 }
                 else
-                       {
+                {
                     pathpos = i;
                     break;
                 }
@@ -277,20 +285,20 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
             }
         }
         if (pathpos == -1)
-       {
+        {
             for (i = 0; i < (int) m_Path.Length(); i++)
-           {
+            {
                 if (m_Path[(unsigned int) i] == wxT(':'))
-                       {
+                {
                     m_Path.Remove(i+1);
                     break;
                 }
             }
             if (i == (int) m_Path.Length())
-               m_Path = wxEmptyString;
+                m_Path = wxEmptyString;
         }
         else
-       {
+        {
             m_Path.Remove(pathpos+1);
         }
     }
@@ -325,10 +333,10 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
     {
         node = m_Handlers.GetFirst();
         while (node)
-       {
+        {
             wxFileSystemHandler *h = (wxFileSystemHandler*) node -> GetData();
             if (h->CanOpen(m_Path + loc))
-               {
+            {
                 s = h->OpenFile(*this, m_Path + loc);
                 if (s) { m_LastName = m_Path + loc; break; }
             }
@@ -341,10 +349,10 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
     {
         node = m_Handlers.GetFirst();
         while (node)
-       {
+        {
             wxFileSystemHandler *h = (wxFileSystemHandler*) node->GetData();
             if (h->CanOpen(loc))
-           {
+            {
                 s = h->OpenFile(*this, loc);
                 if (s) { m_LastName = loc; break; }
             }
@@ -423,6 +431,7 @@ class wxFileSystemModule : public wxModule
         {
             wxFileSystem::AddHandler(new wxLocalFSHandler);
 
+        #if wxUSE_MIMETYPE
             gs_FSMimeFallbacks = new wxFileTypeInfo[6];
             gs_FSMimeFallbacks[0] =
             wxFileTypeInfo("image/jpeg",
@@ -457,14 +466,16 @@ class wxFileSystemModule : public wxModule
             gs_FSMimeFallbacks[5] =
             // must terminate the table with this!
             wxFileTypeInfo();
-
+        #endif
             return TRUE;
         }
         virtual void OnExit()
-       {
+        {
+        #if wxUSE_MIMETYPE
             delete [] gs_FSMimeFallbacks;
+        #endif
             wxFileSystem::CleanUpHandlers();
-       }
+        }
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileSystemModule, wxModule)