fixed bug in wxDateTime::Set(jdn) when DST was in effect

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

diff --git a/src/html/helpdata.cpp b/src/html/helpdata.cpp
index f4866285a2a10ed30b2c6e34b25c0d3b824192a5..88cad1d2a8898c5c647f6ff5b51405737afdc00e 100644 (file)
--- a/src/html/helpdata.cpp
+++ b/src/html/helpdata.cpp
@@ -6,7 +6,7 @@
 // Author:      Harm van der Heijden and Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) Harm van der Heijden and Vaclav Slavik
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
@@ -543,6 +543,7 @@ bool wxHtmlHelpData::AddBookParam(const wxFSFile& bookfile,
     // Now store the contents range
     bookr->SetContentsRange(cont_start, m_ContentsCnt);
 
+#if wxUSE_FONTMAP
     // Convert encoding, if neccessary:
     if (encoding != wxFONTENCODING_SYSTEM)
     {
@@ -559,6 +560,11 @@ bool wxHtmlHelpData::AddBookParam(const wxFSFile& bookfile,
                 conv.Convert(m_Contents[i].m_Name);
         }
     }
+#else
+    wxUnusedVar(IndexOld);
+    wxUnusedVar(ContentsOld);
+    wxASSERT_MSG(encoding == wxFONTENCODING_SYSTEM, wxT("Encoding can't be converted"));
+#endif
 
     m_BookRecords.Add(bookr);
     if (m_IndexCnt > 0)