X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3c7fc996a73e9f6a83067bc28a3c5581a3fee65..f369c7c2841c0534424f2c184783c1a2070012cf:/src/html/chm.cpp?ds=inline diff --git a/src/html/chm.cpp b/src/html/chm.cpp index 1a58175c2d..b8f65ab9c0 100644 --- a/src/html/chm.cpp +++ b/src/html/chm.cpp @@ -17,7 +17,7 @@ #include -#ifndef WXPRECOMP +#ifndef WX_PRECOMP #include "wx/intl.h" #include "wx/log.h" #include "wx/module.h" @@ -696,7 +696,7 @@ wxChmInputStream::CreateHHPStream() bool wxChmInputStream::CreateFileStream(const wxString& pattern) { wxFileInputStream * fin; - wxString tmpfile = wxFileName::CreateTempFileName(_T("chmstrm"), NULL); + wxString tmpfile = wxFileName::CreateTempFileName(_T("chmstrm")); if ( tmpfile.empty() ) { @@ -825,13 +825,11 @@ wxFSFile* wxChmFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), // Open a stream to read the content of the chm-file s = new wxChmInputStream(leftFilename.GetFullPath(), right, true); - wxString mime = GetMimeTypeFromExt(location); - if ( s ) { return new wxFSFile(s, left + _T("#chm:") + right, - mime, + wxEmptyString, GetAnchor(location), wxDateTime(wxFileModificationTime(left))); }