Added wxDC::GetPartialTextExtents

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

diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp
index ceb2810018702e17941cca945c5f17470f3abca1..f8b2a9fa2a23fdbff64eebedd031466ae7bce9cd 100644 (file)
--- a/src/common/filesys.cpp
+++ b/src/common/filesys.cpp
@@ -7,7 +7,7 @@
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "filesys.h"
 #endif
 
@@ -28,7 +28,6 @@
 #include "wx/log.h"
 
 
-
 //--------------------------------------------------------------------------------
 // wxFileSystemHandler
 //--------------------------------------------------------------------------------
@@ -187,11 +186,23 @@ wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString&
     if (!wxFileExists(fullpath))
         return (wxFSFile*) NULL;
 
-    return new wxFSFile(new wxFFileInputStream(fullpath),
+    // we need to check whether we can really read from this file, otherwise
+    // wxFSFile is not going to work
+    wxFFileInputStream *is = new wxFFileInputStream(fullpath);
+    if ( !is->Ok() )
+    {
+        delete is;
+        return (wxFSFile*) NULL;
+    }
+
+    return new wxFSFile(is,
                         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)
@@ -320,7 +331,7 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
     unsigned i, ln;
     char meta;
     wxFSFile *s = NULL;
-    wxNode *node;
+    wxList::compatibility_iterator node;
 
     ln = loc.Length();
     meta = 0;
@@ -374,7 +385,7 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
 
 wxString wxFileSystem::FindFirst(const wxString& spec, int flags)
 {
-    wxNode *node;
+    wxList::compatibility_iterator node;
     wxString spec2(spec);
 
     m_FindFileHandler = NULL;
@@ -421,8 +432,7 @@ void wxFileSystem::AddHandler(wxFileSystemHandler *handler)
 
 void wxFileSystem::CleanUpHandlers()
 {
-    m_Handlers.DeleteContents(TRUE);
-    m_Handlers.Clear();
+    WX_CLEAR_LIST(wxList, m_Handlers);
 }
 
 const static wxString g_unixPathString(wxT("/"));
@@ -441,6 +451,11 @@ wxFileName wxFileSystem::URLToFileName(const wxString& url)
        {
                path = path.Mid(5);
        }
+       // Remove preceding double slash on Mac Classic
+#if defined(__WXMAC__) && !defined(__UNIX__)
+    else if ( path.Find(wxT("//")) == 0 )
+        path = path.Mid(2);
+#endif
     
     path.Replace(wxT("%25"), wxT("%"));
     path.Replace(wxT("%3A"), wxT(":"));
@@ -482,6 +497,10 @@ wxString wxFileSystem::FileNameToURL(const wxFileName& filename)
     else
     {
         url = wxT("/") + url;
+#ifdef __WXMAC__
+        url = wxT("/") + url;
+#endif
+
     }
 #endif
 
@@ -511,31 +530,31 @@ class wxFileSystemModule : public wxModule
                            _T(""),
                            _T(""),
                            _T("JPEG image (from fallback)"),
-                           _T("jpg"), _T("jpeg"), NULL);
+                           _T("jpg"), _T("jpeg"), _T("JPG"), _T("JPEG"), NULL);
             gs_FSMimeFallbacks[1] =
             wxFileTypeInfo(_T("image/gif"),
                            _T(""),
                            _T(""),
                            _T("GIF image (from fallback)"),
-                           _T("gif"), NULL);
+                           _T("gif"), _T("GIF"), NULL);
             gs_FSMimeFallbacks[2] =
             wxFileTypeInfo(_T("image/png"),
                            _T(""),
                            _T(""),
                            _T("PNG image (from fallback)"),
-                           _T("png"), NULL);
+                           _T("png"), _T("PNG"), NULL);
             gs_FSMimeFallbacks[3] =
             wxFileTypeInfo(_T("image/bmp"),
                            _T(""),
                            _T(""),
                            _T("windows bitmap image (from fallback)"),
-                           _T("bmp"), NULL);
+                           _T("bmp"), _T("BMP"), NULL);
             gs_FSMimeFallbacks[4] =
             wxFileTypeInfo(_T("text/html"),
                            _T(""),
                            _T(""),
                            _T("HTML document (from fallback)"),
-                           _T("htm"), _T("html"), NULL);
+                           _T("htm"), _T("html"), _T("HTM"), _T("HTML"), NULL);
             gs_FSMimeFallbacks[5] =
             // must terminate the table with this!
             wxFileTypeInfo();