From 6464f4cbe04abb0ee373ba28556cbe3f22279890 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Fri, 24 Aug 2001 20:12:18 +0000 Subject: [PATCH] Patch (partially back) so that images work in wxHTML. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11463 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/filesys.cpp | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp index d154b75f73..8509d41a02 100644 --- a/src/common/filesys.cpp +++ b/src/common/filesys.cpp @@ -24,7 +24,7 @@ #include "wx/module.h" #include "wx/filesys.h" #include "wx/mimetype.h" - +#include "wx/filename.h" @@ -155,33 +155,24 @@ bool wxLocalFSHandler::CanOpen(const wxString& location) wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location) { + // location has Unix path separators wxString right = GetRightLocation(location); - #ifdef __WXMAC__ - if ( right[0] != '.' && right[0] != '/' && right.Find( '/' ) != wxNOT_FOUND ) { - right = "./" + right ; - } - right = wxUnix2MacFilename( right ) ; - #endif - if (!wxFileExists(right)) + wxFileName fn( right, wxPATH_UNIX ); + + if (!wxFileExists( fn.GetFullPath() )) return (wxFSFile*) NULL; - - return new wxFSFile(new wxFileInputStream(right), + + return new wxFSFile(new wxFileInputStream( fn.GetFullPath() ), right, GetMimeTypeFromExt(location), GetAnchor(location), - wxDateTime(wxFileModificationTime(right))); + wxDateTime(wxFileModificationTime( fn.GetFullPath() ))); } wxString wxLocalFSHandler::FindFirst(const wxString& spec, int flags) { wxString right = GetRightLocation(spec); - #ifdef __WXMAC__ - if ( right[0] != '.' && right[0] != '/' && right.Find( '/' ) != wxNOT_FOUND ) { - right = "./" + right ; - } - right = wxUnix2MacFilename( right ) ; - #endif return wxFindFirstFile(right, flags); } -- 2.50.0