Don't complain under MicroWindows if a wxDC's HDC is NULL - it happens

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

diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp
index 1f9cbc486f57786c9c8c5e9f54681bda573c05a5..c06e2bebc2e023a2c356ba5ef26d6abb10438451 100644 (file)
--- a/src/common/filesys.cpp
+++ b/src/common/filesys.cpp
@@ -17,12 +17,8 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-#if !wxUSE_SOCKETS
-    #undef wxUSE_FS_INET
-    #define wxUSE_FS_INET 0
-#endif

 
 

-#if (wxUSE_HTML || wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS
+#if wxUSE_FILESYSTEM

 
 #include "wx/wfstream.h"
 #include "wx/module.h"
 
 #include "wx/wfstream.h"
 #include "wx/module.h"


@@ -39,6 +35,8 @@
 IMPLEMENT_ABSTRACT_CLASS(wxFileSystemHandler, wxObject)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxFileSystemHandler, wxObject)
 
 

+static wxFileTypeInfo *gs_FSMimeFallbacks = NULL;
+

 wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
 {
     wxString ext = wxEmptyString, mime = wxEmptyString;
 wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
 {
     wxString ext = wxEmptyString, mime = wxEmptyString;


@@ -57,50 +55,18 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
 
     static bool s_MinimalMimeEnsured = FALSE;
     if (!s_MinimalMimeEnsured) {
 
     static bool s_MinimalMimeEnsured = FALSE;
     if (!s_MinimalMimeEnsured) {

-        static const wxFileTypeInfo fallbacks[] =
-        {
-            wxFileTypeInfo("image/jpeg",
-                           "",
-                           "",
-                           "JPEG image (from fallback)",
-                           "jpg", "jpeg", NULL),
-            wxFileTypeInfo("image/gif",
-                           "",
-                           "",
-                           "GIF image (from fallback)",
-                           "gif", NULL),
-            wxFileTypeInfo("image/png",
-                           "",
-                           "",
-                           "PNG image (from fallback)",
-                           "png", NULL),
-            wxFileTypeInfo("image/bmp",
-                           "",
-                           "",
-                           "windows bitmap image (from fallback)",
-                           "bmp", NULL),
-            wxFileTypeInfo("text/html",
-                           "",
-                           "",
-                           "HTML document (from fallback)",
-                           "htm", "html", NULL),
-
-            // must terminate the table with this!
-            wxFileTypeInfo()
-        };
-
-        wxTheMimeTypesManager -> AddFallbacks(fallbacks);
+        wxTheMimeTypesManager -> AddFallbacks(gs_FSMimeFallbacks);
+        s_MinimalMimeEnsured = TRUE;

     }
 
     ft = wxTheMimeTypesManager -> GetFileTypeFromExtension(ext);
     }
 
     ft = wxTheMimeTypesManager -> GetFileTypeFromExtension(ext);

-    if (ft && (ft -> GetMimeType(&mime))) {
-        delete ft; 
-        return mime;
-    }
-    else {
-        delete ft;
-        return wxEmptyString;
+    if ( !ft || !ft -> GetMimeType(&mime) ) {
+        mime = wxEmptyString;

     }
     }

+
+    delete ft;
+
+    return mime;

 }
 
 
 }
 
 


@@ -190,13 +156,15 @@ bool wxLocalFSHandler::CanOpen(const wxString& location)
 wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
 {
     wxString right = GetRightLocation(location);
 wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
 {
     wxString right = GetRightLocation(location);

-    if (wxFileExists(right))
-        return new wxFSFile(new wxFileInputStream(right),
-                            right,
-                            GetMimeTypeFromExt(location),
-                            GetAnchor(location),
-                            wxDateTime(wxFileModificationTime(right)));
-    else return (wxFSFile*) NULL;
+    if (!wxFileExists(right))
+        return (wxFSFile*) NULL;
+
+    return new wxFSFile(new wxFileInputStream(right),
+                        right,
+                        GetMimeTypeFromExt(location),
+                        GetAnchor(location),
+                        wxDateTime(wxFileModificationTime(right)));
+

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


@@ -227,20 +195,20 @@ static wxString MakeCorrectPath(const wxString& path)
     wxString p(path);
     wxString r;
     int i, j, cnt;
     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
     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 (p.Left(2) == wxT("./")) { p = p.Mid(2); cnt -= 2; }

-    
+

     if (cnt < 3) return p;
     if (cnt < 3) return p;

-    
+

     r << p.GetChar(0) << p.GetChar(1);
     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);
     // 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++)
     {
     // remove back references: translate dir1/../dir2 to dir2
     for (; i < cnt; i++)
     {


@@ -255,9 +223,9 @@ static wxString MakeCorrectPath(const wxString& path)
             }
         }
     }
             }
         }
     }

-        
+

     for (; i < cnt; i++) r << p.GetChar(i);
     for (; i < cnt; i++) r << p.GetChar(i);

-        
+

     return r;
 }
 
     return r;
 }
 


@@ -273,7 +241,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('/');
     }
         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--)
     else
     {
         for (i = m_Path.Length()-1; i >= 0; i--)


@@ -330,11 +298,13 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
     meta = 0;
     for (i = 0; i < ln; i++)
     {
     meta = 0;
     for (i = 0; i < ln; i++)
     {

-        if (!meta) 
-            switch (loc[i])
-               {
-                case wxT('/') : case wxT(':') : case wxT('#') : meta = loc[i];
-            }
+        switch (loc[i])
+        {
+            case wxT('/') : case wxT(':') : case wxT('#') :
+                meta = loc[i];
+                break;
+        }
+        if (meta != 0) break;

     }
     m_LastName = wxEmptyString;
 
     }
     m_LastName = wxEmptyString;
 


@@ -378,7 +348,7 @@ wxString wxFileSystem::FindFirst(const wxString& spec, int flags)
 {
     wxNode *node;
     wxString spec2(spec);
 {
     wxNode *node;
     wxString spec2(spec);

-    
+

     m_FindFileHandler = NULL;
 
     for (int i = spec2.Length()-1; i >= 0; i--)
     m_FindFileHandler = NULL;
 
     for (int i = spec2.Length()-1; i >= 0; i--)


@@ -388,10 +358,10 @@ wxString wxFileSystem::FindFirst(const wxString& spec, int flags)
     while (node)
     {
         m_FindFileHandler = (wxFileSystemHandler*) node -> GetData();
     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();
             return m_FindFileHandler -> FindFirst(m_Path + spec2, flags);
         node = node->GetNext();

-    } 
+    }

 
     node = m_Handlers.GetFirst();
     while (node)
 
     node = m_Handlers.GetFirst();
     while (node)


@@ -400,9 +370,9 @@ wxString wxFileSystem::FindFirst(const wxString& spec, int flags)
         if (m_FindFileHandler -> CanOpen(spec2))
             return m_FindFileHandler -> FindFirst(spec2, flags);
         node = node->GetNext();
         if (m_FindFileHandler -> CanOpen(spec2))
             return m_FindFileHandler -> FindFirst(spec2, flags);
         node = node->GetNext();

-    } 
-    
-    return wxEmptyString;   
+    }
+
+    return wxEmptyString;

 }
 
 
 }
 
 


@@ -440,10 +410,47 @@ class wxFileSystemModule : public wxModule
         virtual bool OnInit()
         {
             wxFileSystem::AddHandler(new wxLocalFSHandler);
         virtual bool OnInit()
         {
             wxFileSystem::AddHandler(new wxLocalFSHandler);

+
+            gs_FSMimeFallbacks = new wxFileTypeInfo[6];
+            gs_FSMimeFallbacks[0] =
+            wxFileTypeInfo("image/jpeg",
+                           "",
+                           "",
+                           "JPEG image (from fallback)",
+                           "jpg", "jpeg", NULL);
+            gs_FSMimeFallbacks[1] =
+            wxFileTypeInfo("image/gif",
+                           "",
+                           "",
+                           "GIF image (from fallback)",
+                           "gif", NULL);
+            gs_FSMimeFallbacks[2] =
+            wxFileTypeInfo("image/png",
+                           "",
+                           "",
+                           "PNG image (from fallback)",
+                           "png", NULL);
+            gs_FSMimeFallbacks[3] =
+            wxFileTypeInfo("image/bmp",
+                           "",
+                           "",
+                           "windows bitmap image (from fallback)",
+                           "bmp", NULL);
+            gs_FSMimeFallbacks[4] =
+            wxFileTypeInfo("text/html",
+                           "",
+                           "",
+                           "HTML document (from fallback)",
+                           "htm", "html", NULL);
+            gs_FSMimeFallbacks[5] =
+            // must terminate the table with this!
+            wxFileTypeInfo();
+

             return TRUE;
         }
         virtual void OnExit()
        {
             return TRUE;
         }
         virtual void OnExit()
        {

+            delete [] gs_FSMimeFallbacks;

             wxFileSystem::CleanUpHandlers();
        }
 };
             wxFileSystem::CleanUpHandlers();
        }
 };


@@ -451,7 +458,7 @@ class wxFileSystemModule : public wxModule
 IMPLEMENT_DYNAMIC_CLASS(wxFileSystemModule, wxModule)
 
 #endif
 IMPLEMENT_DYNAMIC_CLASS(wxFileSystemModule, wxModule)
 
 #endif

-  // (wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS
+  // wxUSE_FILESYSTEM