X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/107b52ed174279e09b0bb79fe474ae90dcfdb206..5d7792236f7e4fcbb94cdc2a5213e0c5788e8c28:/src/common/filesys.cpp

diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp
index 1e6cf4880a..1e3740864e 100644
--- a/src/common/filesys.cpp
+++ b/src/common/filesys.cpp
@@ -89,54 +89,54 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
         {
             static const wxFileTypeInfo fallbacks[] =
             {
-                wxFileTypeInfo(_T("image/jpeg"),
+                wxFileTypeInfo(wxT("image/jpeg"),
                     wxEmptyString,
                     wxEmptyString,
-                    _T("JPEG image (from fallback)"),
-                    _T("jpg"), _T("jpeg"), _T("JPG"), _T("JPEG"), wxNullPtr),
-                wxFileTypeInfo(_T("image/gif"),
+                    wxT("JPEG image (from fallback)"),
+                    wxT("jpg"), wxT("jpeg"), wxT("JPG"), wxT("JPEG"), wxNullPtr),
+                wxFileTypeInfo(wxT("image/gif"),
                     wxEmptyString,
                     wxEmptyString,
-                    _T("GIF image (from fallback)"),
-                    _T("gif"), _T("GIF"), wxNullPtr),
-                wxFileTypeInfo(_T("image/png"),
+                    wxT("GIF image (from fallback)"),
+                    wxT("gif"), wxT("GIF"), wxNullPtr),
+                wxFileTypeInfo(wxT("image/png"),
                     wxEmptyString,
                     wxEmptyString,
-                    _T("PNG image (from fallback)"),
-                    _T("png"), _T("PNG"), wxNullPtr),
-                wxFileTypeInfo(_T("image/bmp"),
+                    wxT("PNG image (from fallback)"),
+                    wxT("png"), wxT("PNG"), wxNullPtr),
+                wxFileTypeInfo(wxT("image/bmp"),
                     wxEmptyString,
                     wxEmptyString,
-                    _T("windows bitmap image (from fallback)"),
-                    _T("bmp"), _T("BMP"), wxNullPtr),
-                wxFileTypeInfo(_T("text/html"),
+                    wxT("windows bitmap image (from fallback)"),
+                    wxT("bmp"), wxT("BMP"), wxNullPtr),
+                wxFileTypeInfo(wxT("text/html"),
                     wxEmptyString,
                     wxEmptyString,
-                    _T("HTML document (from fallback)"),
-                    _T("htm"), _T("html"), _T("HTM"), _T("HTML"), wxNullPtr),
+                    wxT("HTML document (from fallback)"),
+                    wxT("htm"), wxT("html"), wxT("HTM"), wxT("HTML"), wxNullPtr),
                 // must terminate the table with this!
                 wxFileTypeInfo()
             };
             wxTheMimeTypesManager->AddFallbacks(fallbacks);
             s_MinimalMimeEnsured = true;
         }
-        
+
         wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(ext);
         if ( !ft || !ft -> GetMimeType(&mime) )
         {
             mime = wxEmptyString;
         }
-        
+
         delete ft;
-        
+
         return mime;
     }
     else
 #endif
     {
-        if ( ext.IsSameAs(wxT("htm"), false) || ext.IsSameAs(_T("html"), false) )
+        if ( ext.IsSameAs(wxT("htm"), false) || ext.IsSameAs(wxT("html"), false) )
             return wxT("text/html");
-        if ( ext.IsSameAs(wxT("jpg"), false) || ext.IsSameAs(_T("jpeg"), false) )
+        if ( ext.IsSameAs(wxT("jpg"), false) || ext.IsSameAs(wxT("jpeg"), false) )
             return wxT("image/jpeg");
         if ( ext.IsSameAs(wxT("gif"), false) )
             return wxT("image/gif");
@@ -244,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
@@ -258,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,
@@ -274,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);
 }
 
 
@@ -537,7 +543,7 @@ bool wxFileSystem::FindFileInPath(wxString *pStr,
 {
     // we assume that it's not empty
     wxCHECK_MSG( !basename.empty(), false,
-                _T("empty file name in wxFileSystem::FindFileInPath"));
+                wxT("empty file name in wxFileSystem::FindFileInPath"));
 
     wxString name;
     // skip path separator in the beginning of the file name if present