projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
copy tif_config.h.vc to tif_config.h, this file will be used for all builds not using...
[wxWidgets.git]
/
src
/
html
/
chm.cpp
diff --git
a/src/html/chm.cpp
b/src/html/chm.cpp
index 1a58175c2df9a4b9c53977d8c61155543d1a06e7..b8f65ab9c04052ccb1b9615e4a631a914229e10b 100644
(file)
--- a/
src/html/chm.cpp
+++ b/
src/html/chm.cpp
@@
-17,7
+17,7
@@
#include <mspack.h>
#include <mspack.h>
-#ifndef WXPRECOMP
+#ifndef WX
_
PRECOMP
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/module.h"
#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;
bool wxChmInputStream::CreateFileStream(const wxString& pattern)
{
wxFileInputStream * fin;
- wxString tmpfile = wxFileName::CreateTempFileName(_T("chmstrm")
, NULL
);
+ wxString tmpfile = wxFileName::CreateTempFileName(_T("chmstrm"));
if ( tmpfile.empty() )
{
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);
// 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,
if ( s )
{
return new wxFSFile(s,
left + _T("#chm:") + right,
-
mime
,
+
wxEmptyString
,
GetAnchor(location),
wxDateTime(wxFileModificationTime(left)));
}
GetAnchor(location),
wxDateTime(wxFileModificationTime(left)));
}