X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0bbfe845edd561191700de32c2b4d0965a5c15b5..90b959aee428b26304ee0056864af48775051496:/src/html/htmlcell.cpp?ds=inline

diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp
index df31b8559d..c907af3fe7 100644
--- a/src/html/htmlcell.cpp
+++ b/src/html/htmlcell.cpp
@@ -140,6 +140,8 @@ wxHtmlWordCell::wxHtmlWordCell(const wxString& word, wxDC& dc) : wxHtmlCell()
                 {
                 ESCSEQ("quot", "\""),
                 ESCSEQ("#34", "\""),
+                ESCSEQ("#8220", "\""),
+                ESCSEQ("#8221", "\""),
                 ESCSEQ("lt", "<"),
                 ESCSEQ("#60", "<"),
                 ESCSEQ("gt", ">"),
@@ -156,6 +158,7 @@ wxHtmlWordCell::wxHtmlWordCell(const wxString& word, wxDC& dc) : wxHtmlCell()
     
                 ESCSEQ("trade", "(TM)"),
                 ESCSEQ("#153", "(TM)"),
+                ESCSEQ("#8482", "(TM)"),
 
                 ESCSEQ("yen", "¥"),
                 ESCSEQ("#165", "¥"),
@@ -231,7 +234,7 @@ wxHtmlWordCell::wxHtmlWordCell(const wxString& word, wxDC& dc) : wxHtmlCell()
                 ESCSEQ("Uuml", "\334"/* Ü */),
     
                 ESCSEQ("szlig", "\247"/* § */),
-                ESCSEQ("agrave;","à"),
+                ESCSEQ("agrave","\340"/* à */),
                 ESCSEQ("aacute", "\341"/* á */),
                 ESCSEQ("acirc", "\342"/* â */),
                 ESCSEQ("atilde", "\343"/* ã */),
@@ -263,9 +266,6 @@ wxHtmlWordCell::wxHtmlWordCell(const wxString& word, wxDC& dc) : wxHtmlCell()
     
                 ESCSEQ("yuml", ""),
 
-                ESCSEQ("#60", "<"),
-                ESCSEQ("#62", ">"),
-
                 /* this one should ALWAYS stay the last one!!! */
                 ESCSEQ("amp", "&"),
                 ESCSEQ("#38", "&"),
@@ -784,7 +784,7 @@ void wxHtmlWidgetCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
         c = c->GetParent();
     }
 
-    ((wxScrolledWindow*)(m_Wnd->GetParent()))->ViewStart(&stx, &sty);
+    ((wxScrolledWindow*)(m_Wnd->GetParent()))->GetViewStart(&stx, &sty);
     m_Wnd->SetSize(absx - wxHTML_SCROLL_STEP * stx, absy  - wxHTML_SCROLL_STEP * sty, m_Width, m_Height);
 
     wxHtmlCell::Draw(dc, x, y, view_y1, view_y2);
@@ -804,7 +804,7 @@ void wxHtmlWidgetCell::DrawInvisible(wxDC& dc, int x, int y)
         c = c->GetParent();
     }
 
-    ((wxScrolledWindow*)(m_Wnd->GetParent()))->ViewStart(&stx, &sty);
+    ((wxScrolledWindow*)(m_Wnd->GetParent()))->GetViewStart(&stx, &sty);
     m_Wnd->SetSize(absx - wxHTML_SCROLL_STEP * stx, absy  - wxHTML_SCROLL_STEP * sty, m_Width, m_Height);
 
     wxHtmlCell::DrawInvisible(dc, x, y);