Updated version to 2.3.2 so apps can test for differences in new merged source

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

diff --git a/src/html/helpdata.cpp b/src/html/helpdata.cpp
index 7469fc6f2e231f23f4d4472edefe87cc53f1be85..76e7264ae8d9c53214a936150c2d2f68e216fa5f 100644 (file)
--- a/src/html/helpdata.cpp
+++ b/src/html/helpdata.cpp
@@ -138,22 +138,6 @@ bool HP_TagHandler::HandleTag(const wxHtmlTag& tag)
 #endif
         if (tag.GetParam(wxT("TYPE")) == wxT("text/sitemap"))
         {
-/*
-            // We're reading in items at level zero, which must mean we want to specify
-            // our own 'books', so chuck out the first (empty) one that AddBook already
-            // created
-            if (m_firstTime && (m_Level == 0) && (m_ItemsCnt > 0))
-            {
-                delete[] m_Items[0].m_Name;
-                delete[] m_Items[0].m_Page;
-                m_ItemsCnt --;
-            }
-            else
-            {
-                if (m_ItemsCnt % wxHTML_REALLOC_STEP == 0)
-                    m_Items = (wxHtmlContentsItem*) realloc(m_Items, (m_ItemsCnt + wxHTML_REALLOC_STEP) * sizeof(wxHtmlContentsItem));
-            }
-*/
             if (m_ItemsCnt % wxHTML_REALLOC_STEP == 0)
                 m_Items = (wxHtmlContentsItem*) realloc(m_Items, 
                                        (m_ItemsCnt + wxHTML_REALLOC_STEP) * 
@@ -184,6 +168,8 @@ bool HP_TagHandler::HandleTag(const wxHtmlTag& tag)
                         {
                 ESCSEQ("quot", "\""),
                 ESCSEQ("#34", "\""),
+                ESCSEQ("#8220", "\""),
+                ESCSEQ("#8221", "\""),
                 ESCSEQ("lt", "<"),
                 ESCSEQ("#60", "<"),
                 ESCSEQ("gt", ">"),
@@ -200,6 +186,7 @@ bool HP_TagHandler::HandleTag(const wxHtmlTag& tag)
     
                 ESCSEQ("trade", "(TM)"),
                 ESCSEQ("#153", "(TM)"),
+                ESCSEQ("#8482", "(TM)"),
 
                 ESCSEQ("yen", "¥"),
                 ESCSEQ("#165", "¥"),
@@ -275,7 +262,7 @@ bool HP_TagHandler::HandleTag(const wxHtmlTag& tag)
                 ESCSEQ("Uuml", "\334"/* Ü */),
     
                 ESCSEQ("szlig", "\247"/* § */),
-                ESCSEQ("agrave;","à"),
+                ESCSEQ("agrave","\340"/* à */),
                 ESCSEQ("aacute", "\341"/* á */),
                 ESCSEQ("acirc", "\342"/* â */),
                 ESCSEQ("atilde", "\343"/* ã */),