X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/79d6c01818cafa1d95973955c8c55519d9550cf1..4760fa91097407e9967efd21f90ef04d69e5bb9c:/src/html/htmlcell.cpp

diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp
index 135e85544d..c867b38366 100644
--- a/src/html/htmlcell.cpp
+++ b/src/html/htmlcell.cpp
@@ -8,7 +8,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
-#pragma implementation
+#pragma implementation "htmlcell.h"
 #endif
 
 #include "wx/wxprec.h"
@@ -17,7 +17,7 @@
 
 #if wxUSE_HTML && wxUSE_STREAMS
 
-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
@@ -29,8 +29,33 @@
 
 #include "wx/html/htmlcell.h"
 #include "wx/html/htmlwin.h"
+#include "wx/settings.h"
 #include <stdlib.h>
 
+//-----------------------------------------------------------------------------
+// Helper classes
+//-----------------------------------------------------------------------------
+
+void wxHtmlSelection::Set(const wxPoint& fromPos, wxHtmlCell *fromCell,
+                          const wxPoint& toPos, wxHtmlCell *toCell)
+{
+    m_fromCell = fromCell;
+    m_toCell = toCell;
+    m_fromPos = fromPos;
+    m_toPos = toPos;
+}
+
+void wxHtmlSelection::Set(wxHtmlCell *fromCell, wxHtmlCell *toCell)
+{
+    wxPoint p1 = fromCell ? fromCell->GetAbsPos() : wxDefaultPosition;
+    wxPoint p2 = toCell ? toCell->GetAbsPos() : wxDefaultPosition;
+    if ( toCell )
+    {
+        p2.x += toCell->GetWidth()-1;
+        p2.y += toCell->GetHeight()-1;
+    }
+    Set(p1, fromCell, p2, toCell);
+}
 
 //-----------------------------------------------------------------------------
 // wxHtmlCell
@@ -47,7 +72,7 @@ wxHtmlCell::wxHtmlCell() : wxObject()
 
 wxHtmlCell::~wxHtmlCell()
 {
-    if (m_Link) delete m_Link;
+    delete m_Link;
 }
 
 
@@ -60,23 +85,24 @@ void wxHtmlCell::OnMouseClick(wxWindow *parent, int x, int y,
         wxHtmlLinkInfo lnk2(*lnk);
         lnk2.SetEvent(&event);
         lnk2.SetHtmlCell(this);
-        ((wxHtmlWindow*)parent)->OnLinkClicked(lnk2);
-        // note : this overcasting is legal because parent is *always* wxHtmlWindow
+
+        // note : this cast is legal because parent is *always* wxHtmlWindow
+        wxStaticCast(parent, wxHtmlWindow)->OnLinkClicked(lnk2);
     }
 }
 
 
 
-bool wxHtmlCell::AdjustPagebreak(int *pagebreak) const
+bool wxHtmlCell::AdjustPagebreak(int *pagebreak, int* WXUNUSED(known_pagebreaks), int WXUNUSED(number_of_pages)) const
 {
     if ((!m_CanLiveOnPagebreak) &&
                 m_PosY < *pagebreak && m_PosY + m_Height > *pagebreak)
-	{
+    {
         *pagebreak = m_PosY;
         return TRUE;
     }
-    else
-        return FALSE;
+
+    return FALSE;
 }
 
 
@@ -103,7 +129,7 @@ void wxHtmlCell::GetHorizontalConstraints(int *left, int *right) const
     if (left)
         *left = m_PosX;
     if (right)
-        *right = m_PosX + m_Width - 1;
+        *right = m_PosX + m_Width;
 }
 
 
@@ -114,6 +140,86 @@ const wxHtmlCell* wxHtmlCell::Find(int WXUNUSED(condition), const void* WXUNUSED
 }
 
 
+wxHtmlCell *wxHtmlCell::FindCellByPos(wxCoord x, wxCoord y,
+                                      unsigned flags) const
+{
+    if ( x >= 0 && x < m_Width && y >= 0 && y < m_Height )
+    {
+        return wxConstCast(this, wxHtmlCell);
+    }
+    else
+    {
+        if ((flags & wxHTML_FIND_NEAREST_AFTER) &&
+                (y < 0 || (y == 0 && x <= 0)))
+            return wxConstCast(this, wxHtmlCell);
+        else if ((flags & wxHTML_FIND_NEAREST_BEFORE) &&
+                (y > m_Height-1 || (y == m_Height-1 && x >= m_Width)))
+            return wxConstCast(this, wxHtmlCell);
+        else
+            return NULL;
+    }
+}
+
+
+wxPoint wxHtmlCell::GetAbsPos() const
+{
+    wxPoint p(m_PosX, m_PosY);
+    for (wxHtmlCell *parent = m_Parent; parent; parent = parent->m_Parent)
+    {
+        p.x += parent->m_PosX;
+        p.y += parent->m_PosY;
+    }
+    return p;
+}
+    
+unsigned wxHtmlCell::GetDepth() const
+{
+    unsigned d = 0;
+    for (wxHtmlCell *p = m_Parent; p; p = p->m_Parent)
+        d++;
+    return d;
+}
+    
+bool wxHtmlCell::IsBefore(wxHtmlCell *cell) const
+{
+    const wxHtmlCell *c1 = this;
+    const wxHtmlCell *c2 = cell;
+    unsigned d1 = GetDepth();
+    unsigned d2 = cell->GetDepth();
+
+    if ( d1 > d2 )
+        for (; d1 != d2; d1-- )
+            c1 = c1->m_Parent;
+    else if ( d1 < d2 )
+        for (; d1 != d2; d2-- )
+            c2 = c2->m_Parent;
+
+    if ( cell == this )
+        return true;
+
+    while ( c1 && c2 )
+    {
+        if ( c1->m_Parent == c2->m_Parent )
+        {
+            while ( c1 )
+            {
+                if ( c1 == c2 )
+                    return true;
+                c1 = c1->GetNext();
+            }            
+            return false;
+        }
+        else
+        {
+            c1 = c1->m_Parent;
+            c2 = c2->m_Parent;
+        }
+    }
+
+    wxFAIL_MSG(_T("Cells are in different trees"));
+    return false;
+}
+
 
 //-----------------------------------------------------------------------------
 // wxHtmlWordCell
@@ -128,10 +234,37 @@ wxHtmlWordCell::wxHtmlWordCell(const wxString& word, wxDC& dc) : wxHtmlCell()
 
 
 
-void wxHtmlWordCell::Draw(wxDC& dc, int x, int y, int WXUNUSED(view_y1), int WXUNUSED(view_y2))
+void wxHtmlWordCell::Draw(wxDC& dc, int x, int y,
+                          int WXUNUSED(view_y1), int WXUNUSED(view_y2),
+                          wxHtmlRenderingState& state)
 {
+    if (state.GetSelectionState() != wxHTML_SEL_OUT &&
+        dc.GetBackgroundMode() != wxSOLID)
+    {
+        dc.SetBackgroundMode(wxSOLID);
+        dc.SetTextBackground(
+                wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT));
+        dc.SetTextForeground(
+                wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT));
+    }
+    else if (state.GetSelectionState() == wxHTML_SEL_OUT &&
+             dc.GetBackgroundMode() == wxSOLID)
+    {
+        dc.SetBackgroundMode(wxTRANSPARENT);
+        dc.SetTextForeground(state.GetFgColour());
+        dc.SetTextBackground(state.GetBgColour());
+    }
+
+    // FIXME - use selection
     dc.DrawText(m_Word, x + m_PosX, y + m_PosY);
 }
+    
+
+wxString wxHtmlWordCell::ConvertToText(wxHtmlSelection *sel) const
+{
+    // FIXME - use selection
+    return m_Word;
+}
 
 
 
@@ -206,20 +339,20 @@ int wxHtmlContainerCell::GetIndentUnits(int ind) const
 
 
 
-bool wxHtmlContainerCell::AdjustPagebreak(int *pagebreak) const
+bool wxHtmlContainerCell::AdjustPagebreak(int *pagebreak, int* known_pagebreaks, int number_of_pages) const
 {
     if (!m_CanLiveOnPagebreak)
-        return wxHtmlCell::AdjustPagebreak(pagebreak);
+        return wxHtmlCell::AdjustPagebreak(pagebreak, known_pagebreaks, number_of_pages);
 
     else
     {
-        wxHtmlCell *c = GetFirstCell();
+        wxHtmlCell *c = GetFirstChild();
         bool rt = FALSE;
         int pbrk = *pagebreak - m_PosY;
 
         while (c)
-	    {
-            if (c->AdjustPagebreak(&pbrk))
+        {
+            if (c->AdjustPagebreak(&pbrk, known_pagebreaks, number_of_pages))
                 rt = TRUE;
             c = c->GetNext();
         }
@@ -233,10 +366,22 @@ bool wxHtmlContainerCell::AdjustPagebreak(int *pagebreak) const
 
 void wxHtmlContainerCell::Layout(int w)
 {
-    if (m_LastLayout == w)
+    wxHtmlCell::Layout(w);
+
+    if (m_LastLayout == w) return;
+
+    // VS: Any attempt to layout with negative or zero width leads to hell,
+    // but we can't ignore such attempts completely, since it sometimes
+    // happen (e.g. when trying how small a table can be). The best thing we
+    // can do is to set the width of child cells to zero
+    if (w < 1)
     {
-        wxHtmlCell::Layout(w);
-        return;
+       m_Width = 0;
+       for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext())
+            cell->Layout(0);
+            // this does two things: it recursively calls this code on all
+            // child contrainers and resets children's position to (0,0)
+       return;
     }
 
     wxHtmlCell *cell = m_Cells, *line = m_Cells;
@@ -287,7 +432,7 @@ void wxHtmlContainerCell::Layout(int w)
     while (cell != NULL)
     {
         switch (m_AlignVer)
-	    {
+        {
             case wxHTML_ALIGN_TOP :      ybasicpos = 0; break;
             case wxHTML_ALIGN_BOTTOM :   ybasicpos = - cell->GetHeight(); break;
             case wxHTML_ALIGN_CENTER :   ybasicpos = - cell->GetHeight() / 2; break;
@@ -304,7 +449,7 @@ void wxHtmlContainerCell::Layout(int w)
 
         // force new line if occured:
         if ((cell == NULL) || (xpos + cell->GetWidth() > s_width))
-	    {
+        {
             if (xpos > MaxLineWidth) MaxLineWidth = xpos;
             if (ysizeup < 0) ysizeup = 0;
             if (ysizedown < 0) ysizedown = 0;
@@ -327,7 +472,7 @@ void wxHtmlContainerCell::Layout(int w)
 
             if (m_AlignHor != wxHTML_ALIGN_JUSTIFY || cell == NULL)
                 while (line != cell)
-		        {
+                {
                     line->SetPos(line->GetPosX() + xdelta,
                                    ypos + line->GetPosY());
                     line = line->GetNext();
@@ -339,7 +484,7 @@ void wxHtmlContainerCell::Layout(int w)
                 if (step < 0) step = 0;
                 xcnt--;
                 if (xcnt > 0) while (line != cell)
-		        {
+                {
                     line->SetPos(line->GetPosX() + s_indent +
                                    (counter++ * step / xcnt),
                                    ypos + line->GetPosY());
@@ -361,12 +506,12 @@ void wxHtmlContainerCell::Layout(int w)
     if (m_Height < m_MinHeight)
     {
         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)
-	        {
+            {
                 cell->SetPos(cell->GetPosX(), cell->GetPosY() + diff);
                 cell = cell->GetNext();
             }
@@ -378,22 +523,41 @@ void wxHtmlContainerCell::Layout(int w)
     if (m_Width < MaxLineWidth) m_Width = MaxLineWidth;
 
     m_LastLayout = w;
+}
 
-    wxHtmlCell::Layout(w);
+void wxHtmlContainerCell::UpdateRenderingStatePre(wxHtmlRenderingState& state,
+                                                  wxHtmlCell *cell) const
+{
+    wxHtmlSelection *s = state.GetSelection();
+    if (!s) return;
+    if (s->GetFromCell() == cell || s->GetToCell() == cell)
+    {
+        state.SetSelectionState(wxHTML_SEL_CHANGING);
+    }
 }
 
+void wxHtmlContainerCell::UpdateRenderingStatePost(wxHtmlRenderingState& state,
+                                                   wxHtmlCell *cell) const
+{
+    wxHtmlSelection *s = state.GetSelection();
+    if (!s) return;
+    if (s->GetToCell() == cell)
+        state.SetSelectionState(wxHTML_SEL_OUT);
+    else if (s->GetFromCell() == cell)
+        state.SetSelectionState(wxHTML_SEL_IN);
+}
 
 #define mMin(a, b) (((a) < (b)) ? (a) : (b))
 #define mMax(a, b) (((a) < (b)) ? (b) : (a))
 
-void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
+void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
+                               wxHtmlRenderingState& state)
 {
     // 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)
-	    {
+        {
             wxBrush myb = wxBrush(m_BkColour, wxSOLID);
 
             int real_y1 = mMax(y + m_PosY, view_y1);
@@ -405,62 +569,73 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
         }
 
         if (m_UseBorder)
-	    {
+        {
             wxPen mypen1(m_BorderColour1, 1, wxSOLID);
             wxPen mypen2(m_BorderColour2, 1, wxSOLID);
 
             dc.SetPen(mypen1);
             dc.DrawLine(x + m_PosX, y + m_PosY, x + m_PosX, y + m_PosY + m_Height - 1);
-            dc.DrawLine(x + m_PosX, y + m_PosY, x + m_PosX + m_Width - 1, y + m_PosY);
+            dc.DrawLine(x + m_PosX, y + m_PosY, x + m_PosX + m_Width, y + m_PosY);
             dc.SetPen(mypen2);
             dc.DrawLine(x + m_PosX + m_Width - 1, y + m_PosY, x + m_PosX +  m_Width - 1, y + m_PosY + m_Height - 1);
-            dc.DrawLine(x + m_PosX, y + m_PosY + m_Height - 1, x + m_PosX + m_Width - 1, y + m_PosY + m_Height - 1);
+            dc.DrawLine(x + m_PosX, y + m_PosY + m_Height - 1, x + m_PosX + m_Width, y + m_PosY + m_Height - 1);
         }
 
         if (m_Cells)
         {
+            // draw container's contents:
             for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext())
-                cell->Draw(dc, x + m_PosX, y + m_PosY, view_y1, view_y2);
+            {
+                UpdateRenderingStatePre(state, cell);
+                cell->Draw(dc,
+                           x + m_PosX, y + m_PosY, view_y1, view_y2,
+                           state);
+                UpdateRenderingStatePost(state, cell);
+            }
         }
     }
     // container invisible, just proceed font+color changing:
     else
     {
-        if (m_Cells)
-        {
-            for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext())
-                cell->DrawInvisible(dc, x + m_PosX, y + m_PosY);
-        }
+        DrawInvisible(dc, x, y, state);
     }
 }
 
 
 
-void wxHtmlContainerCell::DrawInvisible(wxDC& dc, int x, int y)
+void wxHtmlContainerCell::DrawInvisible(wxDC& dc, int x, int y,
+                                        wxHtmlRenderingState& state)
 {
     if (m_Cells)
     {
         for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext())
-            cell->DrawInvisible(dc, x + m_PosX, y + m_PosY);
+        {
+            UpdateRenderingStatePre(state, cell);
+            cell->DrawInvisible(dc, x + m_PosX, y + m_PosY, state);
+            UpdateRenderingStatePost(state, cell);
+        }
     }
 }
 
 
+wxColour wxHtmlContainerCell::GetBackgroundColour()
+{
+    if (m_UseBkColour)
+        return m_BkColour;
+    else
+        return wxNullColour;
+}
+
+
 
 wxHtmlLinkInfo *wxHtmlContainerCell::GetLink(int x, int y) const
 {
-    wxHtmlCell *c = m_Cells;
-    int cx, cy, cw, ch;
+    wxHtmlCell *cell = FindCellByPos(x, y);
 
-    while (c)
-    {
-        cx = c->GetPosX(), cy = c->GetPosY();
-        cw = c->GetWidth(), ch = c->GetHeight();
-        if ((x >= cx) && (x < cx + cw) && (y >= cy) && (y < cy + ch))
-            return c->GetLink(x - cx, y - cy);
-        c = c->GetNext();
-    }
-    return NULL;
+    // VZ: I don't know if we should pass absolute or relative coords to
+    //     wxHtmlCell::GetLink()? As the base class version just ignores them
+    //     anyhow, it hardly matters right now but should still be clarified
+    return cell ? cell->GetLink(x, y) : NULL;
 }
 
 
@@ -508,12 +683,12 @@ void wxHtmlContainerCell::SetWidthFloat(const wxHtmlTag& tag, double pixel_scale
         wxString wd = tag.GetParam(wxT("WIDTH"));
 
         if (wd[wd.Length()-1] == wxT('%'))
-	    {
+        {
             wxSscanf(wd.c_str(), wxT("%i%%"), &wdi);
             SetWidthFloat(wdi, wxHTML_UNITS_PERCENT);
         }
         else
-	    {
+        {
             wxSscanf(wd.c_str(), wxT("%i"), &wdi);
             SetWidthFloat((int)(pixel_scale * (double)wdi), wxHTML_UNITS_PIXELS);
         }
@@ -539,25 +714,60 @@ const wxHtmlCell* wxHtmlContainerCell::Find(int condition, const void* param) co
 }
 
 
-
-void wxHtmlContainerCell::OnMouseClick(wxWindow *parent, int x, int y, const wxMouseEvent& event)
+wxHtmlCell *wxHtmlContainerCell::FindCellByPos(wxCoord x, wxCoord y,
+                                               unsigned flags) const
 {
-    if (m_Cells)
+    if ( flags & wxHTML_FIND_EXACT )
     {
-        wxHtmlCell *c = m_Cells;
-        while (c)
-	    {
-            if (    (c->GetPosX() <= x) &&
-                    (c->GetPosY() <= y) &&
-                    (c->GetPosX() + c->GetWidth() > x) &&
-                    (c->GetPosY() + c->GetHeight() > y))
-		    {
-                c->OnMouseClick(parent, x - c->GetPosX(), y - c->GetPosY(), event);
-                break;
+        for ( const wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext() )
+        {
+            int cx = cell->GetPosX(),
+                cy = cell->GetPosY();
+
+            if ( (cx <= x) && (cx + cell->GetWidth() > x) &&
+                 (cy <= y) && (cy + cell->GetHeight() > y) )
+            {
+                return cell->FindCellByPos(x - cx, y - cy, flags);
             }
-            c = c->GetNext();
         }
     }
+    else if ( flags & wxHTML_FIND_NEAREST_AFTER )
+    {
+        wxHtmlCell *c;
+        int y2;
+        for ( const wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext() )
+        {
+            y2 = cell->GetPosY() + cell->GetHeight() - 1;
+            if (y2 < y || (y2 == y && cell->GetPosX()+cell->GetWidth()-1 < x))
+                continue;
+            c = cell->FindCellByPos(x - cell->GetPosX(), y - cell->GetPosY(),
+                                    flags);
+            if (c) return c;
+        }
+    }
+    else if ( flags & wxHTML_FIND_NEAREST_BEFORE )
+    {
+        wxHtmlCell *c;
+        for ( const wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext() )
+        {
+            if (cell->GetPosY() > y || 
+                    (cell->GetPosY() == y && cell->GetPosX() > x))
+                break;
+            c = cell->FindCellByPos(x - cell->GetPosX(), y - cell->GetPosY(),
+                                    flags);
+            if (c) return c;
+        }
+    }
+
+    return NULL;
+}
+
+
+void wxHtmlContainerCell::OnMouseClick(wxWindow *parent, int x, int y, const wxMouseEvent& event)
+{
+    wxHtmlCell *cell = FindCellByPos(x, y);
+    if ( cell )
+        cell->OnMouseClick(parent, x, y, event);
 }
 
 
@@ -566,7 +776,7 @@ void wxHtmlContainerCell::GetHorizontalConstraints(int *left, int *right) const
 {
     int cleft = m_PosX + m_Width, cright = m_PosX; // worst case
     int l, r;
-    
+
     for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext())
     {
         cell->GetHorizontalConstraints(&l, &r);
@@ -574,7 +784,10 @@ void wxHtmlContainerCell::GetHorizontalConstraints(int *left, int *right) const
             cleft = l;
         if (r > cright)
             cright = r;
-    }  
+    }
+
+    cleft -= (m_IndentLeft < 0) ? (-m_IndentLeft * m_Width / 100) : m_IndentLeft;
+    cright += (m_IndentRight < 0) ? (-m_IndentRight * m_Width / 100) : m_IndentRight;
 
     if (left)
         *left = cleft;
@@ -582,49 +795,90 @@ void wxHtmlContainerCell::GetHorizontalConstraints(int *left, int *right) const
         *right = cright;
 }
 
+    
+wxHtmlCell *wxHtmlContainerCell::GetFirstTerminal() const
+{
+    if ( m_Cells )
+    {
+        wxHtmlCell *c2;
+        for (wxHtmlCell *c = m_Cells; c; c = c->GetNext())
+        {
+            c2 = c->GetFirstTerminal();
+            if ( c2 )
+                return c2;
+        }
+    }
+    return NULL;
+}
+
+wxHtmlCell *wxHtmlContainerCell::GetLastTerminal() const
+{
+    if ( m_Cells )
+    {
+        wxHtmlCell *c, *c2 = NULL;
+        // most common case first:
+        c = m_LastCell->GetLastTerminal();
+        if ( c )
+            return c;
+        for (wxHtmlCell *c = m_Cells; c; c = c->GetNext())
+            c2 = c->GetLastTerminal();
+        return c2;
+    }
+    else
+        return NULL;
+}
 
 
 
 
-//--------------------------------------------------------------------------------
+// --------------------------------------------------------------------------
 // wxHtmlColourCell
-//--------------------------------------------------------------------------------
+// --------------------------------------------------------------------------
 
-void wxHtmlColourCell::Draw(wxDC& dc, int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(view_y1), int WXUNUSED(view_y2))
+void wxHtmlColourCell::Draw(wxDC& dc,
+                            int x, int y,
+                            int WXUNUSED(view_y1), int WXUNUSED(view_y2),
+                            wxHtmlRenderingState& state)
 {
-    if (m_Flags & wxHTML_CLR_FOREGROUND)
-        dc.SetTextForeground(m_Colour);
-    if (m_Flags & wxHTML_CLR_BACKGROUND)
-    {
-        dc.SetBackground(wxBrush(m_Colour, wxSOLID));
-        dc.SetTextBackground(m_Colour);
-    }
+    DrawInvisible(dc, x, y, state);
 }
 
-void wxHtmlColourCell::DrawInvisible(wxDC& dc, int WXUNUSED(x), int WXUNUSED(y))
+void wxHtmlColourCell::DrawInvisible(wxDC& dc,
+                                     int WXUNUSED(x), int WXUNUSED(y),
+                                     wxHtmlRenderingState& state)
 {
     if (m_Flags & wxHTML_CLR_FOREGROUND)
-        dc.SetTextForeground(m_Colour);
+    {
+        state.SetFgColour(m_Colour);
+        if (state.GetSelectionState() != wxHTML_SEL_IN)
+            dc.SetTextForeground(m_Colour);        
+    }
     if (m_Flags & wxHTML_CLR_BACKGROUND)
     {
+        state.SetBgColour(m_Colour);
+        if (state.GetSelectionState() != wxHTML_SEL_IN)
+            dc.SetTextBackground(m_Colour);
         dc.SetBackground(wxBrush(m_Colour, wxSOLID));
-        dc.SetTextBackground(m_Colour);
     }
 }
 
 
 
 
-//--------------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 // wxHtmlFontCell
-//--------------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
-void wxHtmlFontCell::Draw(wxDC& dc, int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(view_y1), int WXUNUSED(view_y2))
+void wxHtmlFontCell::Draw(wxDC& dc,
+                          int WXUNUSED(x), int WXUNUSED(y),
+                          int WXUNUSED(view_y1), int WXUNUSED(view_y2),
+                          wxHtmlRenderingState& WXUNUSED(state))
 {
     dc.SetFont(m_Font);
 }
 
-void wxHtmlFontCell::DrawInvisible(wxDC& dc, int WXUNUSED(x), int WXUNUSED(y))
+void wxHtmlFontCell::DrawInvisible(wxDC& dc, int WXUNUSED(x), int WXUNUSED(y),
+                                   wxHtmlRenderingState& WXUNUSED(state))
 {
     dc.SetFont(m_Font);
 }
@@ -636,9 +890,9 @@ void wxHtmlFontCell::DrawInvisible(wxDC& dc, int WXUNUSED(x), int WXUNUSED(y))
 
 
 
-//--------------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 // wxHtmlWidgetCell
-//--------------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 wxHtmlWidgetCell::wxHtmlWidgetCell(wxWindow *wnd, int w)
 {
@@ -650,7 +904,10 @@ wxHtmlWidgetCell::wxHtmlWidgetCell(wxWindow *wnd, int w)
 }
 
 
-void wxHtmlWidgetCell::Draw(wxDC& WXUNUSED(dc), int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(view_y1), int WXUNUSED(view_y2))
+void wxHtmlWidgetCell::Draw(wxDC& WXUNUSED(dc),
+                            int WXUNUSED(x), int WXUNUSED(y),
+                            int WXUNUSED(view_y1), int WXUNUSED(view_y2),
+                            wxHtmlRenderingState& WXUNUSED(state))
 {
     int absx = 0, absy = 0, stx, sty;
     wxHtmlCell *c = this;
@@ -668,7 +925,9 @@ void wxHtmlWidgetCell::Draw(wxDC& WXUNUSED(dc), int WXUNUSED(x), int WXUNUSED(y)
 
 
 
-void wxHtmlWidgetCell::DrawInvisible(wxDC& WXUNUSED(dc), int WXUNUSED(x), int WXUNUSED(y))
+void wxHtmlWidgetCell::DrawInvisible(wxDC& WXUNUSED(dc),
+                                     int WXUNUSED(x), int WXUNUSED(y),
+                                     wxHtmlRenderingState& WXUNUSED(state))
 {
     int absx = 0, absy = 0, stx, sty;
     wxHtmlCell *c = this;
@@ -697,4 +956,44 @@ void wxHtmlWidgetCell::Layout(int w)
     wxHtmlCell::Layout(w);
 }
 
+
+
+// ----------------------------------------------------------------------------
+// wxHtmlTerminalCellsInterator
+// ----------------------------------------------------------------------------
+
+const wxHtmlCell* wxHtmlTerminalCellsInterator::operator++()
+{
+    if ( !m_pos )
+        return NULL;
+
+    do
+    {
+        if ( m_pos == m_to )
+        {
+            m_pos = NULL;
+            return NULL;
+        }
+
+        if ( m_pos->GetNext() )
+            m_pos = m_pos->GetNext();
+        else
+        {
+            // we must go up the hierarchy until we reach container where this
+            // is not the last child, and then go down to first terminal cell:
+            while ( m_pos->GetNext() == NULL )
+            {
+                m_pos = m_pos->GetParent();
+                if ( !m_pos )
+                    return NULL;
+            }
+            m_pos = m_pos->GetNext();
+        }
+        while ( m_pos->GetFirstChild() != NULL )
+            m_pos = m_pos->GetFirstChild();
+    } while ( !m_pos->IsTerminalCell() );
+    
+    return m_pos;
+}
+
 #endif