X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4f9297b0eead20a0bfee71df18e0d8f0cbc402fb..ef70f0ecdbc4268923e132b257c95e8a2525f4ca:/src/html/htmlcell.cpp

diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp
index ce88a8c569..9e49b42543 100644
--- a/src/html/htmlcell.cpp
+++ b/src/html/htmlcell.cpp
@@ -22,7 +22,9 @@
 #endif
 
 #ifndef WXPRECOMP
-#include "wx/wx.h"
+    #include "wx/brush.h"
+    #include "wx/colour.h"
+    #include "wx/dc.h"
 #endif
 
 #include "wx/html/htmlcell.h"
@@ -34,23 +36,22 @@
 // wxHtmlCell
 //-----------------------------------------------------------------------------
 
-wxHtmlCell::wxHtmlCell() : wxObject() 
+wxHtmlCell::wxHtmlCell() : wxObject()
 {
-    m_Next = NULL; 
-    m_Parent = NULL; 
-    m_Width = m_Height = m_Descent = 0; 
+    m_Next = NULL;
+    m_Parent = NULL;
+    m_Width = m_Height = m_Descent = 0;
     m_CanLiveOnPagebreak = TRUE;
     m_Link = NULL;
 }
 
-wxHtmlCell::~wxHtmlCell() 
+wxHtmlCell::~wxHtmlCell()
 {
-    if (m_Link) delete m_Link; 
-    if (m_Next) delete m_Next;
+    if (m_Link) delete m_Link;
 }
 
 
-void wxHtmlCell::OnMouseClick(wxWindow *parent, int x, int y, 
+void wxHtmlCell::OnMouseClick(wxWindow *parent, int x, int y,
                               const wxMouseEvent& event)
 {
     wxHtmlLinkInfo *lnk = GetLink(x, y);
@@ -68,24 +69,19 @@ void wxHtmlCell::OnMouseClick(wxWindow *parent, int x, int y,
 
 bool wxHtmlCell::AdjustPagebreak(int *pagebreak) const
 {
-    if ((!m_CanLiveOnPagebreak) && 
-                m_PosY < *pagebreak && m_PosY + m_Height > *pagebreak) 
+    if ((!m_CanLiveOnPagebreak) &&
+                m_PosY < *pagebreak && m_PosY + m_Height > *pagebreak)
 	{
         *pagebreak = m_PosY;
-        if (m_Next != NULL) m_Next->AdjustPagebreak(pagebreak);
         return TRUE;
     }
-    
-    else 
-    {
-        if (m_Next != NULL) return m_Next->AdjustPagebreak(pagebreak);
-        else return FALSE;
-    }
+    else
+        return FALSE;
 }
 
 
 
-void wxHtmlCell::SetLink(const wxHtmlLinkInfo& link) 
+void wxHtmlCell::SetLink(const wxHtmlLinkInfo& link)
 {
     if (m_Link) delete m_Link;
     m_Link = NULL;
@@ -95,31 +91,15 @@ void wxHtmlCell::SetLink(const wxHtmlLinkInfo& link)
 
 
 
-void wxHtmlCell::Layout(int w) 
+void wxHtmlCell::Layout(int w)
 {
-    SetPos(0, 0); 
-    if (m_Next) m_Next->Layout(w);
+    SetPos(0, 0);
 }
 
 
-void wxHtmlCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2) 
+const wxHtmlCell* wxHtmlCell::Find(int condition, const void* param) const
 {
-    if (m_Next) m_Next->Draw(dc, x, y, view_y1, view_y2);
-}
-
-
-
-void wxHtmlCell::DrawInvisible(wxDC& dc, int x, int y) 
-{
-    if (m_Next) m_Next->DrawInvisible(dc, x, y);
-}
-
-
-
-const wxHtmlCell* wxHtmlCell::Find(int condition, const void* param) const 
-{
-    if (m_Next) return m_Next->Find(condition, param); 
-    else return NULL;
+    return NULL;
 }
 
 
@@ -131,120 +111,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", "¢"),
-    
-                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", "À"),
-    
-                ESCSEQ("Acirc", "Â"),
-                ESCSEQ("Atilde", "Ã"),
-                ESCSEQ("Auml", "Ä"),
-                ESCSEQ("Aring", " "),
-                ESCSEQ("AElig", " "),
-                ESCSEQ("Ccedil", "ç"),
-                ESCSEQ("Egrave", "È"),
-                ESCSEQ("Eacute", "É"),
-                ESCSEQ("Ecirc", "Ê"),
-                ESCSEQ("Euml", "Ë"),
-                ESCSEQ("Igrave", "Ì"),
-
-                ESCSEQ("Icirc", "Î"),
-                ESCSEQ("Iuml", "Ï"),
-    
-                ESCSEQ("Ntilde", "Ñ"),
-                ESCSEQ("Ograve", "Ò"),
-    
-                ESCSEQ("Ocirc", "Ô"),
-                ESCSEQ("Otilde", "Õ"),
-                ESCSEQ("Ouml", "Ö"),
-    
-                ESCSEQ("Oslash", " "),
-                ESCSEQ("Ugrave", "Ù"),
-    
-                ESCSEQ("Ucirc", " "),
-                ESCSEQ("Uuml", "Ü"),
-    
-                ESCSEQ("szlig", "§"),
-                ESCSEQ("agrave;","à"),
-                ESCSEQ("aacute", "á"),
-                ESCSEQ("acirc", "â"),
-                ESCSEQ("atilde", "ã"),
-                ESCSEQ("auml", "ä"),
-                ESCSEQ("aring", "a"),
-                ESCSEQ("aelig", "ae"),
-                ESCSEQ("ccedil", "ç"),
-                ESCSEQ("egrave", "è"),
-                ESCSEQ("eacute", "é"),
-                ESCSEQ("ecirc", "ê"),
-                ESCSEQ("euml", "ë"),
-                ESCSEQ("igrave", "ì"),
-                ESCSEQ("iacute", "í"),
-                ESCSEQ("icirc", " "),
-                ESCSEQ("iuml", "ï"),
-                ESCSEQ("eth", " "),
-                ESCSEQ("ntilde", "ñ"),
-                ESCSEQ("ograve", "ò"),
-                ESCSEQ("oacute", "ó"),
-                ESCSEQ("ocirc", "ô"),
-                ESCSEQ("otilde", "õ"),
-                ESCSEQ("ouml", "ö"),
-                ESCSEQ("divide", " "),
-                ESCSEQ("oslash", " "),
-                ESCSEQ("ugrave", "ù"),
-                ESCSEQ("uacute", "ú"),
-                ESCSEQ("ucirc", "û"),
-                ESCSEQ("uuml", "ü"),
-    
-                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);
 }
@@ -254,7 +120,6 @@ wxHtmlWordCell::wxHtmlWordCell(const wxString& word, wxDC& dc) : wxHtmlCell()
 void wxHtmlWordCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
 {
     dc.DrawText(m_Word, x + m_PosX, y + m_PosY);
-    wxHtmlCell::Draw(dc, x, y, view_y1, view_y2);
 }
 
 
@@ -280,9 +145,15 @@ wxHtmlContainerCell::wxHtmlContainerCell(wxHtmlContainerCell *parent) : wxHtmlCe
     m_LastLayout = -1;
 }
 
-wxHtmlContainerCell::~wxHtmlContainerCell() 
+wxHtmlContainerCell::~wxHtmlContainerCell()
 {
-    if (m_Cells) delete m_Cells;
+    wxHtmlCell *cell = m_Cells;
+    while ( cell )
+    {
+        wxHtmlCell *cellNext = cell->GetNext();
+        delete cell;
+        cell = cellNext;
+    }
 }
 
 
@@ -326,21 +197,23 @@ int wxHtmlContainerCell::GetIndentUnits(int ind) const
 
 bool wxHtmlContainerCell::AdjustPagebreak(int *pagebreak) const
 {
-    if (!m_CanLiveOnPagebreak) 
+    if (!m_CanLiveOnPagebreak)
         return wxHtmlCell::AdjustPagebreak(pagebreak);
 
-    else 
+    else
     {
         wxHtmlCell *c = GetFirstCell();
         bool rt = FALSE;
         int pbrk = *pagebreak - m_PosY;
 
-        while (c) 
+        while (c)
 	    {
-            if (c->AdjustPagebreak(&pbrk)) rt = TRUE;
+            if (c->AdjustPagebreak(&pbrk)) 
+                rt = TRUE;
             c = c->GetNext();
         }
-        if (rt) *pagebreak = pbrk + m_PosY;
+        if (rt) 
+            *pagebreak = pbrk + m_PosY;
         return rt;
     }
 }
@@ -349,11 +222,11 @@ bool wxHtmlContainerCell::AdjustPagebreak(int *pagebreak) const
 
 void wxHtmlContainerCell::Layout(int w)
 {
-    if (m_LastLayout == w) 
+    if (m_LastLayout == w)
     {
         wxHtmlCell::Layout(w);
         return;
-    } 
+    }
 
     wxHtmlCell *cell = m_Cells, *line = m_Cells;
     long xpos = 0, ypos = m_IndentTop;
@@ -370,22 +243,23 @@ void wxHtmlContainerCell::Layout(int w)
 
     */
 
-    if (m_WidthFloatUnits == wxHTML_UNITS_PERCENT) 
+    if (m_WidthFloatUnits == wxHTML_UNITS_PERCENT)
     {
         if (m_WidthFloat < 0) m_Width = (100 + m_WidthFloat) * w / 100;
         else m_Width = m_WidthFloat * w / 100;
     }
-    else 
+    else
     {
         if (m_WidthFloat < 0) m_Width = w + m_WidthFloat;
         else m_Width = m_WidthFloat;
     }
 
-    if (m_Cells) 
+    if (m_Cells)
     {
         int l = (m_IndentLeft < 0) ? (-m_IndentLeft * m_Width / 100) : m_IndentLeft;
         int r = (m_IndentRight < 0) ? (-m_IndentRight * m_Width / 100) : m_IndentRight;
-        m_Cells->Layout(m_Width - (l + r));
+        for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext())
+            cell->Layout(m_Width - (l + r));
     }
 
     /*
@@ -399,9 +273,9 @@ void wxHtmlContainerCell::Layout(int w)
     s_width = m_Width - s_indent - ((m_IndentRight < 0) ? (-m_IndentRight * m_Width / 100) : m_IndentRight);
 
     // my own layouting:
-    while (cell != NULL) 
+    while (cell != NULL)
     {
-        switch (m_AlignVer) 
+        switch (m_AlignVer)
 	    {
             case wxHTML_ALIGN_TOP :      ybasicpos = 0; break;
             case wxHTML_ALIGN_BOTTOM :   ybasicpos = - cell->GetHeight(); break;
@@ -418,42 +292,42 @@ void wxHtmlContainerCell::Layout(int w)
         xcnt++;
 
         // force new line if occured:
-        if ((cell == NULL) || (xpos + cell->GetWidth() > s_width)) 
+        if ((cell == NULL) || (xpos + cell->GetWidth() > s_width))
 	    {
             if (xpos > MaxLineWidth) MaxLineWidth = xpos;
             if (ysizeup < 0) ysizeup = 0;
             if (ysizedown < 0) ysizedown = 0;
             switch (m_AlignHor) {
-                case wxHTML_ALIGN_LEFT : 
-                case wxHTML_ALIGN_JUSTIFY : 
-                         xdelta = 0; 
+                case wxHTML_ALIGN_LEFT :
+                case wxHTML_ALIGN_JUSTIFY :
+                         xdelta = 0;
                          break;
-                case wxHTML_ALIGN_RIGHT : 
-                         xdelta = 0 + (s_width - xpos); 
+                case wxHTML_ALIGN_RIGHT :
+                         xdelta = 0 + (s_width - xpos);
                          break;
-                case wxHTML_ALIGN_CENTER : 
-                         xdelta = 0 + (s_width - xpos) / 2; 
+                case wxHTML_ALIGN_CENTER :
+                         xdelta = 0 + (s_width - xpos) / 2;
                          break;
             }
             if (xdelta < 0) xdelta = 0;
             xdelta += s_indent;
 
             ypos += ysizeup;
-            
+
             if (m_AlignHor != wxHTML_ALIGN_JUSTIFY || cell == NULL)
-                while (line != cell) 
+                while (line != cell)
 		        {
-                    line->SetPos(line->GetPosX() + xdelta, 
+                    line->SetPos(line->GetPosX() + xdelta,
                                    ypos + line->GetPosY());
                     line = line->GetNext();
                 }
             else
-            { 
+            {
                 int counter = 0;
                 int step = (s_width - xpos);
                 if (step < 0) step = 0;
                 xcnt--;
-                if (xcnt > 0) while (line != cell) 
+                if (xcnt > 0) while (line != cell)
 		        {
                     line->SetPos(line->GetPosX() + s_indent +
                                    (counter++ * step / xcnt),
@@ -473,14 +347,14 @@ void wxHtmlContainerCell::Layout(int w)
     // setup height & width, depending on container layout:
     m_Height = ypos + (ysizedown + ysizeup) + m_IndentBottom;
 
-    if (m_Height < m_MinHeight) 
+    if (m_Height < m_MinHeight)
     {
-        if (m_MinHeightAlign != wxHTML_ALIGN_TOP) 
+        if (m_MinHeightAlign != wxHTML_ALIGN_TOP)
 	    {
             int diff = m_MinHeight - m_Height;
             if (m_MinHeightAlign == wxHTML_ALIGN_CENTER) diff /= 2;
             cell = m_Cells;
-            while (cell) 
+            while (cell)
 	        {
                 cell->SetPos(cell->GetPosX(), cell->GetPosY() + diff);
                 cell = cell->GetNext();
@@ -504,10 +378,10 @@ void wxHtmlContainerCell::Layout(int w)
 void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
 {
     // container visible, draw it:
-    if ((y + m_PosY < view_y2) && (y + m_PosY + m_Height > view_y1)) 
+    if ((y + m_PosY < view_y2) && (y + m_PosY + m_Height > view_y1))
     {
 
-        if (m_UseBkColour) 
+        if (m_UseBkColour)
 	    {
             wxBrush myb = wxBrush(m_BkColour, wxSOLID);
 
@@ -519,7 +393,7 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
             dc.DrawRectangle(x + m_PosX, real_y1, m_Width, real_y2 - real_y1 + 1);
         }
 
-        if (m_UseBorder) 
+        if (m_UseBorder)
 	    {
             wxPen mypen1(m_BorderColour1, 1, wxSOLID);
             wxPen mypen2(m_BorderColour2, 1, wxSOLID);
@@ -532,23 +406,32 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
             dc.DrawLine(x + m_PosX, y + m_PosY + m_Height - 1, x + m_PosX + m_Width - 1, y + m_PosY + m_Height - 1);
         }
 
-        if (m_Cells) m_Cells->Draw(dc, x + m_PosX, y + m_PosY, view_y1, view_y2);
+        if (m_Cells) 
+        {
+            for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext())
+                cell->Draw(dc, x + m_PosX, y + m_PosY, view_y1, view_y2);
+        }
     }
     // container invisible, just proceed font+color changing:
-    else 
+    else
     {
-        if (m_Cells) m_Cells->DrawInvisible(dc, x + m_PosX, y + m_PosY);
+        if (m_Cells) 
+        {
+            for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext())
+                cell->DrawInvisible(dc, x + m_PosX, y + m_PosY);
+        }
     }
-
-    wxHtmlCell::Draw(dc, x, y, view_y1, view_y2);
 }
 
 
 
 void wxHtmlContainerCell::DrawInvisible(wxDC& dc, int x, int y)
 {
-    if (m_Cells) m_Cells->DrawInvisible(dc, x + m_PosX, y + m_PosY);
-    wxHtmlCell::DrawInvisible(dc, x, y);
+    if (m_Cells) 
+    {
+        for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext())
+            cell->DrawInvisible(dc, x + m_PosX, y + m_PosY);
+    }
 }
 
 
@@ -558,7 +441,7 @@ wxHtmlLinkInfo *wxHtmlContainerCell::GetLink(int x, int y) const
     wxHtmlCell *c = m_Cells;
     int cx, cy, cw, ch;
 
-    while (c) 
+    while (c)
     {
         cx = c->GetPosX(), cy = c->GetPosY();
         cw = c->GetWidth(), ch = c->GetHeight();
@@ -574,7 +457,7 @@ wxHtmlLinkInfo *wxHtmlContainerCell::GetLink(int x, int y) const
 void wxHtmlContainerCell::InsertCell(wxHtmlCell *f)
 {
     if (!m_Cells) m_Cells = m_LastCell = f;
-    else 
+    else
     {
         m_LastCell->SetNext(f);
         m_LastCell = f;
@@ -588,7 +471,7 @@ void wxHtmlContainerCell::InsertCell(wxHtmlCell *f)
 
 void wxHtmlContainerCell::SetAlign(const wxHtmlTag& tag)
 {
-    if (tag.HasParam(wxT("ALIGN"))) 
+    if (tag.HasParam(wxT("ALIGN")))
     {
         wxString alg = tag.GetParam(wxT("ALIGN"));
         alg.MakeUpper();
@@ -608,17 +491,17 @@ void wxHtmlContainerCell::SetAlign(const wxHtmlTag& tag)
 
 void wxHtmlContainerCell::SetWidthFloat(const wxHtmlTag& tag, double pixel_scale)
 {
-    if (tag.HasParam(wxT("WIDTH"))) 
+    if (tag.HasParam(wxT("WIDTH")))
     {
         int wdi;
         wxString wd = tag.GetParam(wxT("WIDTH"));
 
-        if (wd[wd.Length()-1] == wxT('%')) 
+        if (wd[wd.Length()-1] == wxT('%'))
 	    {
             wxSscanf(wd.c_str(), wxT("%i%%"), &wdi);
             SetWidthFloat(wdi, wxHTML_UNITS_PERCENT);
         }
-        else 
+        else
 	    {
             wxSscanf(wd.c_str(), wxT("%i"), &wdi);
             SetWidthFloat((int)(pixel_scale * (double)wdi), wxHTML_UNITS_PIXELS);
@@ -631,30 +514,32 @@ void wxHtmlContainerCell::SetWidthFloat(const wxHtmlTag& tag, double pixel_scale
 
 const wxHtmlCell* wxHtmlContainerCell::Find(int condition, const void* param) const
 {
-    const wxHtmlCell *r = NULL;
+    if (m_Cells)
+    {   
+        const wxHtmlCell *r = NULL;
 
-    if (m_Cells) 
-    {
-        r = m_Cells->Find(condition, param);
-        if (r) return r;
+        for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext())
+        {
+            r = cell->Find(condition, param);
+            if (r) return r;
+        }
     }
-
-    return wxHtmlCell::Find(condition, param);
+    return NULL;
 }
 
 
 
 void wxHtmlContainerCell::OnMouseClick(wxWindow *parent, int x, int y, const wxMouseEvent& event)
 {
-    if (m_Cells) 
+    if (m_Cells)
     {
         wxHtmlCell *c = m_Cells;
-        while (c) 
+        while (c)
 	    {
             if (    (c->GetPosX() <= x) &&
                     (c->GetPosY() <= y) &&
                     (c->GetPosX() + c->GetWidth() > x) &&
-                    (c->GetPosY() + c->GetHeight() > y)) 
+                    (c->GetPosY() + c->GetHeight() > y))
 		    {
                 c->OnMouseClick(parent, x - c->GetPosX(), y - c->GetPosY(), event);
                 break;
@@ -676,24 +561,22 @@ void wxHtmlColourCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
 {
     if (m_Flags & wxHTML_CLR_FOREGROUND)
         dc.SetTextForeground(m_Colour);
-    if (m_Flags & wxHTML_CLR_BACKGROUND) 
+    if (m_Flags & wxHTML_CLR_BACKGROUND)
     {
         dc.SetBackground(wxBrush(m_Colour, wxSOLID));
         dc.SetTextBackground(m_Colour);
     }
-    wxHtmlCell::Draw(dc, x, y, view_y1, view_y2);
 }
 
 void wxHtmlColourCell::DrawInvisible(wxDC& dc, int x, int y)
 {
     if (m_Flags & wxHTML_CLR_FOREGROUND)
         dc.SetTextForeground(m_Colour);
-    if (m_Flags & wxHTML_CLR_BACKGROUND) 
+    if (m_Flags & wxHTML_CLR_BACKGROUND)
     {
         dc.SetBackground(wxBrush(m_Colour, wxSOLID));
         dc.SetTextBackground(m_Colour);
     }
-    wxHtmlCell::DrawInvisible(dc, x, y);
 }
 
 
@@ -706,13 +589,11 @@ void wxHtmlColourCell::DrawInvisible(wxDC& dc, int x, int y)
 void wxHtmlFontCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
 {
     dc.SetFont(m_Font);
-    wxHtmlCell::Draw(dc, x, y, view_y1, view_y2);
 }
 
 void wxHtmlFontCell::DrawInvisible(wxDC& dc, int x, int y)
 {
     dc.SetFont(m_Font);
-    wxHtmlCell::DrawInvisible(dc, x, y);
 }
 
 
@@ -741,17 +622,15 @@ void wxHtmlWidgetCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
     int absx = 0, absy = 0, stx, sty;
     wxHtmlCell *c = this;
 
-    while (c) 
+    while (c)
     {
         absx += c->GetPosX();
         absy += c->GetPosY();
         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);
 }
 
 
@@ -761,24 +640,22 @@ void wxHtmlWidgetCell::DrawInvisible(wxDC& dc, int x, int y)
     int absx = 0, absy = 0, stx, sty;
     wxHtmlCell *c = this;
 
-    while (c) 
+    while (c)
     {
         absx += c->GetPosX();
         absy += c->GetPosY();
         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);
 }
 
 
 
 void wxHtmlWidgetCell::Layout(int w)
 {
-    if (m_WidthFloat != 0) 
+    if (m_WidthFloat != 0)
     {
         m_Width = (w * m_WidthFloat) / 100;
         m_Wnd->SetSize(m_Width, m_Height);