use FromUTF8() when loading XML, data coming from Expat are already validated UTF-8

[wxWidgets.git] / src / html / chm.cpp

diff --git a/src/html/chm.cpp b/src/html/chm.cpp
index 1a58175c2df9a4b9c53977d8c61155543d1a06e7..70dbf6188634277f6eed40dcbf375c1490e775bd 100644 (file)
--- a/src/html/chm.cpp
+++ b/src/html/chm.cpp
@@ -17,7 +17,7 @@
 
 #include <mspack.h>
 
-#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() )
     {