remove confusing wxDialog::ButtonSizerFlags and extract button styles properly in...

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

diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp
index d0f4901ebb41f9e835226d20fc69e9a7f6235eb6..003ff698b8295377040dae665904ac1b755d7675 100644 (file)
--- a/src/common/filesys.cpp
+++ b/src/common/filesys.cpp
@@ -81,12 +81,9 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
 
     // Don't use mime types manager if the application doesn't need it and it would be
     // cause an unacceptable delay, especially on startup.
-    bool useMimeTypesManager = true;
 #if wxUSE_SYSTEM_OPTIONS
-    useMimeTypesManager = (wxSystemOptions::GetOptionInt(wxT("filesys.no-mimetypesmanager")) == 0);
+    if ( !wxSystemOptions::GetOptionInt(wxT("filesys.no-mimetypesmanager")) )
 #endif
-
-    if (useMimeTypesManager)
     {
         if (!s_MinimalMimeEnsured)
         {
@@ -97,28 +94,28 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
                     wxEmptyString,
                     _T("JPEG image (from fallback)"),
                     _T("jpg"), _T("jpeg"), _T("JPG"), _T("JPEG"), wxNullPtr),
-                    wxFileTypeInfo(_T("image/gif"),
+                wxFileTypeInfo(_T("image/gif"),
                     wxEmptyString,
                     wxEmptyString,
                     _T("GIF image (from fallback)"),
                     _T("gif"), _T("GIF"), wxNullPtr),
-                    wxFileTypeInfo(_T("image/png"),
+                wxFileTypeInfo(_T("image/png"),
                     wxEmptyString,
                     wxEmptyString,
                     _T("PNG image (from fallback)"),
                     _T("png"), _T("PNG"), wxNullPtr),
-                    wxFileTypeInfo(_T("image/bmp"),
+                wxFileTypeInfo(_T("image/bmp"),
                     wxEmptyString,
                     wxEmptyString,
                     _T("windows bitmap image (from fallback)"),
                     _T("bmp"), _T("BMP"), wxNullPtr),
-                    wxFileTypeInfo(_T("text/html"),
+                wxFileTypeInfo(_T("text/html"),
                     wxEmptyString,
                     wxEmptyString,
                     _T("HTML document (from fallback)"),
                     _T("htm"), _T("html"), _T("HTM"), _T("HTML"), wxNullPtr),
-                    // must terminate the table with this!
-                    wxFileTypeInfo()
+                // must terminate the table with this!
+                wxFileTypeInfo()
             };
             wxTheMimeTypesManager->AddFallbacks(fallbacks);
             s_MinimalMimeEnsured = true;
@@ -247,7 +244,7 @@ wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString&
     wxString fullpath = ms_root + fn.GetFullPath();
 
     if (!wxFileExists(fullpath))
-        return (wxFSFile*) NULL;
+        return NULL;
 
     // we need to check whether we can really read from this file, otherwise
     // wxFSFile is not going to work
@@ -261,7 +258,7 @@ wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString&
     if ( !is->Ok() )
     {
         delete is;
-        return (wxFSFile*) NULL;
+        return NULL;
     }
 
     return new wxFSFile(is,
@@ -277,12 +274,18 @@ wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString&
 wxString wxLocalFSHandler::FindFirst(const wxString& spec, int flags)
 {
     wxFileName fn = wxFileSystem::URLToFileName(GetRightLocation(spec));
-    return wxFindFirstFile(ms_root + fn.GetFullPath(), flags);
+    const wxString found = wxFindFirstFile(ms_root + fn.GetFullPath(), flags);
+    if ( found.empty() )
+        return found;
+    return wxFileSystem::FileNameToURL(found);
 }
 
 wxString wxLocalFSHandler::FindNext()
 {
-    return wxFindNextFile();
+    const wxString found = wxFindNextFile();
+    if ( found.empty() )
+        return found;
+    return wxFileSystem::FileNameToURL(found);
 }