X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/93f30ee67a6111aceefdea7bb78b8eb3d26740fd..5adad46628e545a6d4172ecf3a0cb848934f5cd0:/src/html/htmlcell.cpp

diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp
index abb94c4a3b..cd927aa55c 100644
--- a/src/html/htmlcell.cpp
+++ b/src/html/htmlcell.cpp
@@ -131,120 +131,6 @@ const wxHtmlCell* wxHtmlCell::Find(int condition, const void* param) const
 wxHtmlWordCell::wxHtmlWordCell(const wxString& word, wxDC& dc) : wxHtmlCell()
 {
     m_Word = word;
-    
-    if (m_Word.Find(wxT('&')) != -1) 
-    {
-#define ESCSEQ(escape, subst)  \
-                  { _T("&") _T(escape) _T(";"), _T("&") _T(escape) _T(" "), _T(subst) } 
-        static wxChar* substitutions[][3] = 
-                {
-                ESCSEQ("quot", "\""),
-                ESCSEQ("lt", "<"),
-                ESCSEQ("gt", ">"),
-    
-                ESCSEQ("nbsp", " "),
-                ESCSEQ("iexcl", "!"),
-                ESCSEQ("cent", "\242"/* ¢ */),
-    
-                ESCSEQ("yen", " "),
-                ESCSEQ("brkbar", " "),
-                ESCSEQ("sect", " "),
-                ESCSEQ("uml", " "),
-    
-                ESCSEQ("copy", "(c)"),
-                ESCSEQ("ordf", " "),
-                ESCSEQ("laquo", " "),
-                ESCSEQ("not", " "),
-    
-                ESCSEQ("reg", "(r)"),
-    
-                ESCSEQ("deg", " "),
-                ESCSEQ("plusm", " "),
-    
-                ESCSEQ("acute", " "),
-                ESCSEQ("micro", " "),
-                ESCSEQ("para", " "),
-    
-                ESCSEQ("ordm", " "),
-                ESCSEQ("raquo", " "),
-    
-                ESCSEQ("iquest", " "),
-                ESCSEQ("Agrave", "\300"/* À */),
-    
-                ESCSEQ("Acirc", "\302"/* Â */),
-                ESCSEQ("Atilde", "\303"/* Ã */),
-                ESCSEQ("Auml", "\304"/* Ä */),
-                ESCSEQ("Aring", " "),
-                ESCSEQ("AElig", " "),
-                ESCSEQ("Ccedil", "\347"/* ç */),
-                ESCSEQ("Egrave", "\310"/* È */),
-                ESCSEQ("Eacute", "\311"/* É */),
-                ESCSEQ("Ecirc", "\312"/* Ê */),
-                ESCSEQ("Euml", "\313"/* Ë */),
-                ESCSEQ("Igrave", "\314"/* Ì */),
-
-                ESCSEQ("Icirc", "\316"/* Î */),
-                ESCSEQ("Iuml", "\317"/* Ï */),
-    
-                ESCSEQ("Ntilde", "\321"/* Ñ */),
-                ESCSEQ("Ograve", "\322"/* Ò */),
-    
-                ESCSEQ("Ocirc", "\324"/* Ô */),
-                ESCSEQ("Otilde", "\325"/* Õ */),
-                ESCSEQ("Ouml", "\326"/* Ö */),
-    
-                ESCSEQ("Oslash", " "),
-                ESCSEQ("Ugrave", "\331"/* Ù */),
-    
-                ESCSEQ("Ucirc", " "),
-                ESCSEQ("Uuml", "\334"/* Ü */),
-    
-                ESCSEQ("szlig", "\247"/* § */),
-                ESCSEQ("agrave;","à"),
-                ESCSEQ("aacute", "\341"/* á */),
-                ESCSEQ("acirc", "\342"/* â */),
-                ESCSEQ("atilde", "\343"/* ã */),
-                ESCSEQ("auml", "\344"/* ä */),
-                ESCSEQ("aring", "a"),
-                ESCSEQ("aelig", "ae"),
-                ESCSEQ("ccedil", "\347"/* ç */),
-                ESCSEQ("egrave", "\350"/* è */),
-                ESCSEQ("eacute", "\351"/* é */),
-                ESCSEQ("ecirc", "\352"/* ê */),
-                ESCSEQ("euml", "\353"/* ë */),
-                ESCSEQ("igrave", "\354"/* ì */),
-                ESCSEQ("iacute", "\355"/* í */),
-                ESCSEQ("icirc", " "),
-                ESCSEQ("iuml", "\357"/* ï */),
-                ESCSEQ("eth", " "),
-                ESCSEQ("ntilde", "\361"/* ñ */),
-                ESCSEQ("ograve", "\362"/* ò */),
-                ESCSEQ("oacute", "\363"/* ó */),
-                ESCSEQ("ocirc", "\364"/* ô */),
-                ESCSEQ("otilde", "\365"/* õ */),
-                ESCSEQ("ouml", "\366"/* ö */),
-                ESCSEQ("divide", " "),
-                ESCSEQ("oslash", " "),
-                ESCSEQ("ugrave", "\371"/* ù */),
-                ESCSEQ("uacute", "\372"/* ú */),
-                ESCSEQ("ucirc", "\373"/* û */),
-                ESCSEQ("uuml", "\374"/* ü */),
-    
-                ESCSEQ("yuml", ""),
-
-                /* this one should ALWAYS stay the last one!!! */
-                ESCSEQ("amp", "&"),
-
-                { NULL, NULL, NULL }
-                };
-
-        for (int i = 0; substitutions[i][0] != NULL; i++) 
-        {
-            m_Word.Replace(substitutions[i][0], substitutions[i][2], TRUE);
-            m_Word.Replace(substitutions[i][1], substitutions[i][2], TRUE);
-        }
-    }
-
     dc.GetTextExtent(m_Word, &m_Width, &m_Height, &m_Descent);
     SetCanLiveOnPagebreak(FALSE);
 }
@@ -748,7 +634,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);
@@ -768,7 +654,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);