make it possible to restart timer with a simple Start(), as in other ports

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

diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp
index 648130d0014d6a3b41b9f5d7cc5238330cede6a5..f8b2a9fa2a23fdbff64eebedd031466ae7bce9cd 100644 (file)
--- a/src/common/filesys.cpp
+++ b/src/common/filesys.cpp
@@ -186,7 +186,16 @@ wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString&
     if (!wxFileExists(fullpath))
         return (wxFSFile*) NULL;
 
     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)
                         right,
                         GetMimeTypeFromExt(location),
                         GetAnchor(location)


@@ -521,31 +530,31 @@ class wxFileSystemModule : public wxModule
                            _T(""),
                            _T(""),
                            _T("JPEG image (from fallback)"),
                            _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)"),
             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)"),
             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)"),
             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)"),
             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();
             gs_FSMimeFallbacks[5] =
             // must terminate the table with this!
             wxFileTypeInfo();