another file I added on the wxUniv branch and forgot to merge

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

diff --git a/src/html/helpdata.cpp b/src/html/helpdata.cpp
index 8250d38e4931df37c61f5480480047b19264bde1..76e7264ae8d9c53214a936150c2d2f68e216fa5f 100644 (file)
--- a/src/html/helpdata.cpp
+++ b/src/html/helpdata.cpp
@@ -142,6 +142,7 @@ bool HP_TagHandler::HandleTag(const wxHtmlTag& tag)
                 m_Items = (wxHtmlContentsItem*) realloc(m_Items, 
                                        (m_ItemsCnt + wxHTML_REALLOC_STEP) * 
                                        sizeof(wxHtmlContentsItem));
                 m_Items = (wxHtmlContentsItem*) realloc(m_Items, 
                                        (m_ItemsCnt + wxHTML_REALLOC_STEP) * 
                                        sizeof(wxHtmlContentsItem));

+

             m_Items[m_ItemsCnt].m_Level = m_Level;
             m_Items[m_ItemsCnt].m_ID = m_ID;
             m_Items[m_ItemsCnt].m_Page = new wxChar[m_Page.Length() + 1];
             m_Items[m_ItemsCnt].m_Level = m_Level;
             m_Items[m_ItemsCnt].m_ID = m_ID;
             m_Items[m_ItemsCnt].m_Page = new wxChar[m_Page.Length() + 1];


@@ -167,6 +168,8 @@ bool HP_TagHandler::HandleTag(const wxHtmlTag& tag)
                         {
                 ESCSEQ("quot", "\""),
                 ESCSEQ("#34", "\""),
                         {
                 ESCSEQ("quot", "\""),
                 ESCSEQ("#34", "\""),

+                ESCSEQ("#8220", "\""),
+                ESCSEQ("#8221", "\""),

                 ESCSEQ("lt", "<"),
                 ESCSEQ("#60", "<"),
                 ESCSEQ("gt", ">"),
                 ESCSEQ("lt", "<"),
                 ESCSEQ("#60", "<"),
                 ESCSEQ("gt", ">"),


@@ -183,6 +186,7 @@ bool HP_TagHandler::HandleTag(const wxHtmlTag& tag)
     
                 ESCSEQ("trade", "(TM)"),
                 ESCSEQ("#153", "(TM)"),
     
                 ESCSEQ("trade", "(TM)"),
                 ESCSEQ("#153", "(TM)"),

+                ESCSEQ("#8482", "(TM)"),

 
                 ESCSEQ("yen", "¥"),
                 ESCSEQ("#165", "¥"),
 
                 ESCSEQ("yen", "¥"),
                 ESCSEQ("#165", "¥"),


@@ -258,7 +262,7 @@ bool HP_TagHandler::HandleTag(const wxHtmlTag& tag)
                 ESCSEQ("Uuml", "\334"/* Ü */),
     
                 ESCSEQ("szlig", "\247"/* § */),
                 ESCSEQ("Uuml", "\334"/* Ü */),
     
                 ESCSEQ("szlig", "\247"/* § */),

-                ESCSEQ("agrave;","à"),
+                ESCSEQ("agrave","\340"/* à */),

                 ESCSEQ("aacute", "\341"/* á */),
                 ESCSEQ("acirc", "\342"/* â */),
                 ESCSEQ("atilde", "\343"/* ã */),
                 ESCSEQ("aacute", "\341"/* á */),
                 ESCSEQ("acirc", "\342"/* â */),
                 ESCSEQ("atilde", "\343"/* ã */),