fixed to not duplicate code needlessly; clarified why gtk_file_chooser_set_current_na...

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

diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp
index c867b38366010622b3cfeb4a8adffce97d3276cb..8ea2197716ad12b3b459ca0c2de4f5c1bfd6e009 100644 (file)
--- a/src/html/htmlcell.cpp
+++ b/src/html/htmlcell.cpp
@@ -4,10 +4,10 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik

-// Licence:     wxWindows Licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "htmlcell.h"
 #endif
 
 #pragma implementation "htmlcell.h"
 #endif
 


@@ -30,14 +30,25 @@
 #include "wx/html/htmlcell.h"
 #include "wx/html/htmlwin.h"
 #include "wx/settings.h"
 #include "wx/html/htmlcell.h"
 #include "wx/html/htmlwin.h"
 #include "wx/settings.h"

+#include "wx/module.h"
+#include "wx/dynarray.h"
+

 #include <stdlib.h>
 
 #include <stdlib.h>
 

+//-----------------------------------------------------------------------------
+// Global variables
+//-----------------------------------------------------------------------------
+
+static wxCursor *gs_cursorLink = NULL;
+static wxCursor *gs_cursorText = NULL;
+
+

 //-----------------------------------------------------------------------------
 // Helper classes
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // Helper classes
 //-----------------------------------------------------------------------------
 

-void wxHtmlSelection::Set(const wxPoint& fromPos, wxHtmlCell *fromCell,
-                          const wxPoint& toPos, wxHtmlCell *toCell)
+void wxHtmlSelection::Set(const wxPoint& fromPos, const wxHtmlCell *fromCell,
+                          const wxPoint& toPos, const wxHtmlCell *toCell)

 {
     m_fromCell = fromCell;
     m_toCell = toCell;
 {
     m_fromCell = fromCell;
     m_toCell = toCell;


@@ -45,28 +56,45 @@ void wxHtmlSelection::Set(const wxPoint& fromPos, wxHtmlCell *fromCell,
     m_toPos = toPos;
 }
 
     m_toPos = toPos;
 }
 

-void wxHtmlSelection::Set(wxHtmlCell *fromCell, wxHtmlCell *toCell)
+void wxHtmlSelection::Set(const wxHtmlCell *fromCell, const wxHtmlCell *toCell)

 {
     wxPoint p1 = fromCell ? fromCell->GetAbsPos() : wxDefaultPosition;
     wxPoint p2 = toCell ? toCell->GetAbsPos() : wxDefaultPosition;
     if ( 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;
+        p2.x += toCell->GetWidth();
+        p2.y += toCell->GetHeight();

     }
     Set(p1, fromCell, p2, toCell);
 }
 
     }
     Set(p1, fromCell, p2, toCell);
 }
 

+wxColour
+wxDefaultHtmlRenderingStyle::
+GetSelectedTextColour(const wxColour& WXUNUSED(clr))
+{
+    return wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
+}
+
+wxColour
+wxDefaultHtmlRenderingStyle::
+GetSelectedTextBgColour(const wxColour& WXUNUSED(clr))
+{
+    return wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
+}
+
+

 //-----------------------------------------------------------------------------
 // wxHtmlCell
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxHtmlCell
 //-----------------------------------------------------------------------------
 

+IMPLEMENT_ABSTRACT_CLASS(wxHtmlCell, wxObject)
+

 wxHtmlCell::wxHtmlCell() : wxObject()
 {
     m_Next = NULL;
     m_Parent = NULL;
     m_Width = m_Height = m_Descent = 0;
 wxHtmlCell::wxHtmlCell() : wxObject()
 {
     m_Next = NULL;
     m_Parent = NULL;
     m_Width = m_Height = m_Descent = 0;

-    m_CanLiveOnPagebreak = TRUE;
+    m_CanLiveOnPagebreak = true;

     m_Link = NULL;
 }
 
     m_Link = NULL;
 }
 


@@ -92,6 +120,18 @@ void wxHtmlCell::OnMouseClick(wxWindow *parent, int x, int y,
 }
 
 
 }
 
 

+wxCursor wxHtmlCell::GetCursor() const
+{
+    if ( GetLink() )
+    {
+        if ( !gs_cursorLink )
+            gs_cursorLink = new wxCursor(wxCURSOR_HAND);
+        return *gs_cursorLink;
+    }
+    else
+        return *wxSTANDARD_CURSOR;
+}
+

 
 bool wxHtmlCell::AdjustPagebreak(int *pagebreak, int* WXUNUSED(known_pagebreaks), int WXUNUSED(number_of_pages)) const
 {
 
 bool wxHtmlCell::AdjustPagebreak(int *pagebreak, int* WXUNUSED(known_pagebreaks), int WXUNUSED(number_of_pages)) const
 {


@@ -99,10 +139,10 @@ bool wxHtmlCell::AdjustPagebreak(int *pagebreak, int* WXUNUSED(known_pagebreaks)
                 m_PosY < *pagebreak && m_PosY + m_Height > *pagebreak)
     {
         *pagebreak = m_PosY;
                 m_PosY < *pagebreak && m_PosY + m_Height > *pagebreak)
     {
         *pagebreak = m_PosY;

-        return TRUE;
+        return true;

     }
 
     }
 

-    return FALSE;
+    return false;

 }
 
 
 }
 
 


@@ -116,7 +156,6 @@ void wxHtmlCell::SetLink(const wxHtmlLinkInfo& link)
 }
 
 
 }
 
 

-

 void wxHtmlCell::Layout(int WXUNUSED(w))
 {
     SetPos(0, 0);
 void wxHtmlCell::Layout(int WXUNUSED(w))
 {
     SetPos(0, 0);


@@ -124,16 +163,6 @@ void wxHtmlCell::Layout(int WXUNUSED(w))
 
 
 
 
 
 

-void wxHtmlCell::GetHorizontalConstraints(int *left, int *right) const
-{
-    if (left)
-        *left = m_PosX;
-    if (right)
-        *right = m_PosX + m_Width;
-}
-
-
-

 const wxHtmlCell* wxHtmlCell::Find(int WXUNUSED(condition), const void* WXUNUSED(param)) const
 {
     return NULL;
 const wxHtmlCell* wxHtmlCell::Find(int WXUNUSED(condition), const void* WXUNUSED(param)) const
 {
     return NULL;


@@ -150,10 +179,10 @@ wxHtmlCell *wxHtmlCell::FindCellByPos(wxCoord x, wxCoord y,
     else
     {
         if ((flags & wxHTML_FIND_NEAREST_AFTER) &&
     else
     {
         if ((flags & wxHTML_FIND_NEAREST_AFTER) &&

-                (y < 0 || (y == 0 && x <= 0)))
+                (y < 0 || (y < 0+m_Height && x < 0+m_Width)))

             return wxConstCast(this, wxHtmlCell);
         else if ((flags & wxHTML_FIND_NEAREST_BEFORE) &&
             return wxConstCast(this, wxHtmlCell);
         else if ((flags & wxHTML_FIND_NEAREST_BEFORE) &&

-                (y > m_Height-1 || (y == m_Height-1 && x >= m_Width)))
+                (y >= 0+m_Height || (y >= 0 && x >= 0)))

             return wxConstCast(this, wxHtmlCell);
         else
             return NULL;
             return wxConstCast(this, wxHtmlCell);
         else
             return NULL;


@@ -171,7 +200,7 @@ wxPoint wxHtmlCell::GetAbsPos() const
     }
     return p;
 }
     }
     return p;
 }

-    
+

 unsigned wxHtmlCell::GetDepth() const
 {
     unsigned d = 0;
 unsigned wxHtmlCell::GetDepth() const
 {
     unsigned d = 0;


@@ -179,7 +208,7 @@ unsigned wxHtmlCell::GetDepth() const
         d++;
     return d;
 }
         d++;
     return d;
 }

-    
+

 bool wxHtmlCell::IsBefore(wxHtmlCell *cell) const
 {
     const wxHtmlCell *c1 = this;
 bool wxHtmlCell::IsBefore(wxHtmlCell *cell) const
 {
     const wxHtmlCell *c1 = this;


@@ -206,7 +235,7 @@ bool wxHtmlCell::IsBefore(wxHtmlCell *cell) const
                 if ( c1 == c2 )
                     return true;
                 c1 = c1->GetNext();
                 if ( c1 == c2 )
                     return true;
                 c1 = c1->GetNext();

-            }            
+            }

             return false;
         }
         else
             return false;
         }
         else


@@ -225,65 +254,289 @@ bool wxHtmlCell::IsBefore(wxHtmlCell *cell) const
 // wxHtmlWordCell
 //-----------------------------------------------------------------------------
 
 // wxHtmlWordCell
 //-----------------------------------------------------------------------------
 

+IMPLEMENT_ABSTRACT_CLASS(wxHtmlWordCell, wxHtmlCell)
+

 wxHtmlWordCell::wxHtmlWordCell(const wxString& word, wxDC& dc) : wxHtmlCell()
 {
     m_Word = word;
     dc.GetTextExtent(m_Word, &m_Width, &m_Height, &m_Descent);
 wxHtmlWordCell::wxHtmlWordCell(const wxString& word, wxDC& dc) : wxHtmlCell()
 {
     m_Word = word;
     dc.GetTextExtent(m_Word, &m_Width, &m_Height, &m_Descent);

-    SetCanLiveOnPagebreak(FALSE);
+    SetCanLiveOnPagebreak(false);
+    m_allowLinebreak = true;

 }
 
 }
 

+void wxHtmlWordCell::SetPreviousWord(wxHtmlWordCell *cell)
+{
+    if ( cell && m_Parent == cell->m_Parent &&
+         !wxIsspace(cell->m_Word.Last()) && !wxIsspace(m_Word[0u]) )
+    {
+        m_allowLinebreak = false;
+    }
+}

 
 

+// Splits m_Word into up to three parts according to selection, returns
+// substring before, in and after selection and the points (in relative coords)
+// where s2 and s3 start:
+void wxHtmlWordCell::Split(wxDC& dc,
+                           const wxPoint& selFrom, const wxPoint& selTo,
+                           unsigned& pos1, unsigned& pos2) const
+{
+    wxPoint pt1 = (selFrom == wxDefaultPosition) ?
+                   wxDefaultPosition : selFrom - GetAbsPos();
+    wxPoint pt2 = (selTo == wxDefaultPosition) ?
+                   wxPoint(m_Width, wxDefaultCoord) : selTo - GetAbsPos();
+
+    wxCoord charW, charH;
+    unsigned len = m_Word.length();
+    unsigned i = 0;
+    pos1 = 0;
+
+    // adjust for cases when the start/end position is completely
+    // outside the cell:
+    if ( pt1.y < 0 )
+        pt1.x = 0;
+    if ( pt2.y >= m_Height )
+        pt2.x = m_Width;
+
+    // before selection:
+    while ( pt1.x > 0 && i < len )
+    {
+        dc.GetTextExtent(m_Word[i], &charW, &charH);
+        pt1.x -= charW;
+        if ( pt1.x >= 0 )
+        {
+            pos1 += charW;
+            i++;
+        }
+    }

 
 

-void wxHtmlWordCell::Draw(wxDC& dc, int x, int y,
-                          int WXUNUSED(view_y1), int WXUNUSED(view_y2),
-                          wxHtmlRenderingState& state)
+    // in selection:
+    unsigned j = i;
+    pos2 = pos1;
+    pt2.x -= pos2;
+    while ( pt2.x > 0 && j < len )
+    {
+        dc.GetTextExtent(m_Word[j], &charW, &charH);
+        pt2.x -= charW;
+        if ( pt2.x >= 0 )
+        {
+            pos2 += charW;
+            j++;
+        }
+    }
+
+    pos1 = i;
+    pos2 = j;
+}
+
+void wxHtmlWordCell::SetSelectionPrivPos(wxDC& dc, wxHtmlSelection *s) const
+{
+    unsigned p1, p2;
+
+    Split(dc,
+          this == s->GetFromCell() ? s->GetFromPos() : wxDefaultPosition,
+          this == s->GetToCell() ? s->GetToPos() : wxDefaultPosition,
+          p1, p2);
+
+    wxPoint p(0, m_Word.length());
+
+    if ( this == s->GetFromCell() )
+        p.x = p1; // selection starts here
+    if ( this == s->GetToCell() )
+        p.y = p2; // selection ends here
+
+    if ( this == s->GetFromCell() )
+        s->SetFromPrivPos(p);
+    if ( this == s->GetToCell() )
+        s->SetToPrivPos(p);
+}
+
+
+static void SwitchSelState(wxDC& dc, wxHtmlRenderingInfo& info,
+                           bool toSelection)

 {
 {

-    if (state.GetSelectionState() != wxHTML_SEL_OUT &&
-        dc.GetBackgroundMode() != wxSOLID)
+    wxColour fg = info.GetState().GetFgColour();
+    wxColour bg = info.GetState().GetBgColour();
+
+    if ( toSelection )

     {
         dc.SetBackgroundMode(wxSOLID);
     {
         dc.SetBackgroundMode(wxSOLID);

-        dc.SetTextBackground(
-                wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT));
-        dc.SetTextForeground(
-                wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT));
+        dc.SetTextForeground(info.GetStyle().GetSelectedTextColour(fg));
+        dc.SetTextBackground(info.GetStyle().GetSelectedTextBgColour(bg));
+        dc.SetBackground(wxBrush(info.GetStyle().GetSelectedTextBgColour(bg),
+                                 wxSOLID));

     }
     }

-    else if (state.GetSelectionState() == wxHTML_SEL_OUT &&
-             dc.GetBackgroundMode() == wxSOLID)
+    else

     {
         dc.SetBackgroundMode(wxTRANSPARENT);
     {
         dc.SetBackgroundMode(wxTRANSPARENT);

-        dc.SetTextForeground(state.GetFgColour());
-        dc.SetTextBackground(state.GetBgColour());
+        dc.SetTextForeground(fg);
+        dc.SetTextBackground(bg);
+        dc.SetBackground(wxBrush(bg, wxSOLID));

     }
     }

+}
+
+
+void wxHtmlWordCell::Draw(wxDC& dc, int x, int y,
+                          int WXUNUSED(view_y1), int WXUNUSED(view_y2),
+                          wxHtmlRenderingInfo& info)
+{
+#if 0 // useful for debugging
+    dc.SetPen(*wxBLACK_PEN);
+    dc.DrawRectangle(x+m_PosX,y+m_PosY,m_Width /* VZ: +1? */ ,m_Height);
+#endif
+
+    bool drawSelectionAfterCell = false;
+
+    if ( info.GetState().GetSelectionState() == wxHTML_SEL_CHANGING )
+    {
+        // Selection changing, we must draw the word piecewise:
+        wxHtmlSelection *s = info.GetSelection();
+        wxString txt;
+        int w, h;
+        int ofs = 0;
+
+        wxPoint priv = (this == s->GetFromCell()) ?
+                           s->GetFromPrivPos() : s->GetToPrivPos();
+
+        // NB: this is quite a hack: in order to compute selection boundaries
+        //     (in word's characters) we must know current font, which is only
+        //     possible inside rendering code. Therefore we update the
+        //     information here and store it in wxHtmlSelection so that
+        //     ConvertToText can use it later:
+        if ( priv == wxDefaultPosition )
+        {
+            SetSelectionPrivPos(dc, s);
+            priv = (this == s->GetFromCell()) ?
+                    s->GetFromPrivPos() : s->GetToPrivPos();
+        }
+
+        int part1 = priv.x;
+        int part2 = priv.y;
+
+        if ( part1 > 0 )
+        {
+            txt = m_Word.Mid(0, part1);
+            dc.DrawText(txt, x + m_PosX, y + m_PosY);
+            dc.GetTextExtent(txt, &w, &h);
+            ofs += w;
+        }

 
 

-    // FIXME - use selection
-    dc.DrawText(m_Word, x + m_PosX, y + m_PosY);
+        SwitchSelState(dc, info, true);
+
+        txt = m_Word.Mid(part1, part2-part1);
+        dc.DrawText(txt, ofs + x + m_PosX, y + m_PosY);
+
+        if ( (size_t)part2 < m_Word.length() )
+        {
+            dc.GetTextExtent(txt, &w, &h);
+            ofs += w;
+            SwitchSelState(dc, info, false);
+            txt = m_Word.Mid(part2);
+            dc.DrawText(txt, ofs + x + m_PosX, y + m_PosY);
+        }
+        else
+            drawSelectionAfterCell = true;
+    }
+    else
+    {
+        wxHtmlSelectionState selstate = info.GetState().GetSelectionState();
+        // Not changing selection state, draw the word in single mode:
+        if ( selstate != wxHTML_SEL_OUT &&
+             dc.GetBackgroundMode() != wxSOLID )
+        {
+            SwitchSelState(dc, info, true);
+        }
+        else if ( selstate == wxHTML_SEL_OUT &&
+                  dc.GetBackgroundMode() == wxSOLID )
+        {
+            SwitchSelState(dc, info, false);
+        }
+        dc.DrawText(m_Word, x + m_PosX, y + m_PosY);
+        drawSelectionAfterCell = (selstate != wxHTML_SEL_OUT);
+    }
+
+    // NB: If the text is justified then there is usually some free space
+    //     between adjacent cells and drawing the selection only onto cells
+    //     would result in ugly unselected spaces. The code below detects
+    //     this special case and renders the selection *outside* the sell,
+    //     too.
+    if ( m_Parent->GetAlignHor() == wxHTML_ALIGN_JUSTIFY &&
+         drawSelectionAfterCell )
+    {
+        wxHtmlCell *nextCell = m_Next;
+        while ( nextCell && nextCell->IsFormattingCell() )
+            nextCell = nextCell->GetNext();
+        if ( nextCell )
+        {
+            int nextX = nextCell->GetPosX();
+            if ( m_PosX + m_Width < nextX )
+            {
+                dc.SetBrush(dc.GetBackground());
+                dc.SetPen(*wxTRANSPARENT_PEN);
+                dc.DrawRectangle(x + m_PosX + m_Width, y + m_PosY,
+                                 nextX - m_PosX - m_Width, m_Height);
+            }
+        }
+    }

 }
 }

-    

 
 

-wxString wxHtmlWordCell::ConvertToText(wxHtmlSelection *sel) const
+
+wxString wxHtmlWordCell::ConvertToText(wxHtmlSelection *s) const

 {
 {

-    // FIXME - use selection
+    if ( s && (this == s->GetFromCell() || this == s->GetToCell()) )
+    {
+        wxPoint priv = this == s->GetFromCell() ? s->GetFromPrivPos()
+                                                : s->GetToPrivPos();
+
+        // VZ: we may be called before we had a chance to re-render ourselves
+        //     and in this case GetFrom/ToPrivPos() is not set yet -- assume
+        //     that this only happens in case of a double/triple click (which
+        //     seems to be the case now) and so it makes sense to select the
+        //     entire contents of the cell in this case
+        //
+        // TODO: but this really needs to be fixed in some better way later...
+        if ( priv != wxDefaultPosition )
+        {
+            int part1 = priv.x;
+            int part2 = priv.y;
+            return m_Word.Mid(part1, part2-part1);
+        }
+        //else: return the whole word below
+    }
+

     return m_Word;
 }
 
     return m_Word;
 }
 

+wxCursor wxHtmlWordCell::GetCursor() const
+{
+    if ( !GetLink() )
+    {
+        if ( !gs_cursorText )
+            gs_cursorText = new wxCursor(wxCURSOR_IBEAM);
+        return *gs_cursorText;
+    }
+    else
+        return wxHtmlCell::GetCursor();
+}

 
 
 //-----------------------------------------------------------------------------
 // wxHtmlContainerCell
 //-----------------------------------------------------------------------------
 
 
 
 //-----------------------------------------------------------------------------
 // wxHtmlContainerCell
 //-----------------------------------------------------------------------------
 

+IMPLEMENT_ABSTRACT_CLASS(wxHtmlContainerCell, wxHtmlCell)

 
 wxHtmlContainerCell::wxHtmlContainerCell(wxHtmlContainerCell *parent) : wxHtmlCell()
 {
     m_Cells = m_LastCell = NULL;
     m_Parent = parent;
 
 wxHtmlContainerCell::wxHtmlContainerCell(wxHtmlContainerCell *parent) : wxHtmlCell()
 {
     m_Cells = m_LastCell = NULL;
     m_Parent = parent;

+    m_MaxTotalWidth = 0;

     if (m_Parent) m_Parent->InsertCell(this);
     m_AlignHor = wxHTML_ALIGN_LEFT;
     m_AlignVer = wxHTML_ALIGN_BOTTOM;
     m_IndentLeft = m_IndentRight = m_IndentTop = m_IndentBottom = 0;
     m_WidthFloat = 100; m_WidthFloatUnits = wxHTML_UNITS_PERCENT;
     if (m_Parent) m_Parent->InsertCell(this);
     m_AlignHor = wxHTML_ALIGN_LEFT;
     m_AlignVer = wxHTML_ALIGN_BOTTOM;
     m_IndentLeft = m_IndentRight = m_IndentTop = m_IndentBottom = 0;
     m_WidthFloat = 100; m_WidthFloatUnits = wxHTML_UNITS_PERCENT;

-    m_UseBkColour = FALSE;
-    m_UseBorder = FALSE;
+    m_UseBkColour = false;
+    m_UseBorder = false;

     m_MinHeight = 0;
     m_MinHeightAlign = wxHTML_ALIGN_TOP;
     m_LastLayout = -1;
     m_MinHeight = 0;
     m_MinHeightAlign = wxHTML_ALIGN_TOP;
     m_LastLayout = -1;


@@ -328,7 +581,7 @@ int wxHtmlContainerCell::GetIndent(int ind) const
 
 int wxHtmlContainerCell::GetIndentUnits(int ind) const
 {
 
 int wxHtmlContainerCell::GetIndentUnits(int ind) const
 {

-    bool p = FALSE;
+    bool p = false;

     if (ind & wxHTML_INDENT_LEFT) p = m_IndentLeft < 0;
     else if (ind & wxHTML_INDENT_RIGHT) p = m_IndentRight < 0;
     else if (ind & wxHTML_INDENT_TOP) p = m_IndentTop < 0;
     if (ind & wxHTML_INDENT_LEFT) p = m_IndentLeft < 0;
     else if (ind & wxHTML_INDENT_RIGHT) p = m_IndentRight < 0;
     else if (ind & wxHTML_INDENT_TOP) p = m_IndentTop < 0;


@@ -347,13 +600,13 @@ bool wxHtmlContainerCell::AdjustPagebreak(int *pagebreak, int* known_pagebreaks,
     else
     {
         wxHtmlCell *c = GetFirstChild();
     else
     {
         wxHtmlCell *c = GetFirstChild();

-        bool rt = FALSE;
+        bool rt = false;

         int pbrk = *pagebreak - m_PosY;
 
         while (c)
         {
             if (c->AdjustPagebreak(&pbrk, known_pagebreaks, number_of_pages))
         int pbrk = *pagebreak - m_PosY;
 
         while (c)
         {
             if (c->AdjustPagebreak(&pbrk, known_pagebreaks, number_of_pages))

-                rt = TRUE;
+                rt = true;

             c = c->GetNext();
         }
         if (rt)
             c = c->GetNext();
         }
         if (rt)


@@ -384,13 +637,16 @@ void wxHtmlContainerCell::Layout(int w)
        return;
     }
 
        return;
     }
 

-    wxHtmlCell *cell = m_Cells, *line = m_Cells;
+    wxHtmlCell *cell = m_Cells,
+               *line = m_Cells;
+    wxHtmlCell *nextCell;

     long xpos = 0, ypos = m_IndentTop;
     int xdelta = 0, ybasicpos = 0, ydiff;
     long xpos = 0, ypos = m_IndentTop;
     int xdelta = 0, ybasicpos = 0, ydiff;

-    int s_width, s_indent;
+    int s_width, nextWordWidth, s_indent;

     int ysizeup = 0, ysizedown = 0;
     int MaxLineWidth = 0;
     int ysizeup = 0, ysizedown = 0;
     int MaxLineWidth = 0;

-    int xcnt = 0;
+    int curLineWidth = 0;
+    m_MaxTotalWidth = 0;

 
 
     /*
 
 
     /*


@@ -442,13 +698,40 @@ void wxHtmlContainerCell::Layout(int w)
         if (cell->GetDescent() + ydiff > ysizedown) ysizedown = cell->GetDescent() + ydiff;
         if (ybasicpos + cell->GetDescent() < -ysizeup) ysizeup = - (ybasicpos + cell->GetDescent());
 
         if (cell->GetDescent() + ydiff > ysizedown) ysizedown = cell->GetDescent() + ydiff;
         if (ybasicpos + cell->GetDescent() < -ysizeup) ysizeup = - (ybasicpos + cell->GetDescent());
 

+        // layout nonbreakable run of cells:

         cell->SetPos(xpos, ybasicpos + cell->GetDescent());
         xpos += cell->GetWidth();
         cell->SetPos(xpos, ybasicpos + cell->GetDescent());
         xpos += cell->GetWidth();

+        if (!cell->IsTerminalCell())
+        {
+            // Container cell indicates new line
+            if (curLineWidth > m_MaxTotalWidth)
+                m_MaxTotalWidth = curLineWidth;
+
+            if (wxMax(cell->GetWidth(), cell->GetMaxTotalWidth()) > m_MaxTotalWidth)
+                m_MaxTotalWidth = cell->GetMaxTotalWidth();
+            curLineWidth = 0;
+        }
+        else
+            // Normal cell, add maximum cell width to line width
+            curLineWidth += cell->GetMaxTotalWidth();
+

         cell = cell->GetNext();
         cell = cell->GetNext();

-        xcnt++;
+
+        // compute length of the next word that would be added:
+        nextWordWidth = 0;
+        if (cell)
+        {
+            nextCell = cell;
+            do
+            {
+                nextWordWidth += nextCell->GetWidth();
+                nextCell = nextCell->GetNext();
+            } while (nextCell && !nextCell->IsLinebreakAllowed());
+        }

 
         // force new line if occured:
 
         // force new line if occured:

-        if ((cell == NULL) || (xpos + cell->GetWidth() > s_width))
+        if ((cell == NULL) ||
+            (xpos + nextWordWidth > s_width && cell->IsLinebreakAllowed()))

         {
             if (xpos > MaxLineWidth) MaxLineWidth = xpos;
             if (ysizeup < 0) ysizeup = 0;
         {
             if (xpos > MaxLineWidth) MaxLineWidth = xpos;
             if (ysizeup < 0) ysizeup = 0;


@@ -471,30 +754,88 @@ void wxHtmlContainerCell::Layout(int w)
             ypos += ysizeup;
 
             if (m_AlignHor != wxHTML_ALIGN_JUSTIFY || cell == NULL)
             ypos += ysizeup;
 
             if (m_AlignHor != wxHTML_ALIGN_JUSTIFY || cell == NULL)

+            {

                 while (line != cell)
                 {
                     line->SetPos(line->GetPosX() + xdelta,
                                    ypos + line->GetPosY());
                     line = line->GetNext();
                 }
                 while (line != cell)
                 {
                     line->SetPos(line->GetPosX() + xdelta,
                                    ypos + line->GetPosY());
                     line = line->GetNext();
                 }

-            else
+            }
+            else // align == justify

             {
             {

-                int counter = 0;
-                int step = (s_width - xpos);
-                if (step < 0) step = 0;
-                xcnt--;
-                if (xcnt > 0) while (line != cell)
+                // we have to distribute the extra horz space between the cells
+                // on this line
+
+                // an added complication is that some cells have fixed size and
+                // shouldn't get any increment (it so happens that these cells
+                // also don't allow line break on them which provides with an
+                // easy way to test for this) -- and neither should the cells
+                // adjacent to them as this could result in a visible space
+                // between two cells separated by, e.g. font change, cell which
+                // is wrong
+
+                int step = s_width - xpos;
+                if ( step > 0 )

                 {
                 {

-                    line->SetPos(line->GetPosX() + s_indent +
-                                   (counter++ * step / xcnt),
-                                   ypos + line->GetPosY());
-                    line = line->GetNext();
+                    // first count the cells which will get extra space
+                    int total = 0;
+
+                    const wxHtmlCell *c;
+                    if ( line != cell )
+                    {
+                        for ( c = line->GetNext(); c != cell; c = c->GetNext() )
+                        {
+                            if ( c->IsLinebreakAllowed() )
+                            {
+                                total++;
+                            }
+                        }
+                    }
+
+                    // and now extra space to those cells which merit it
+                    if ( total )
+                    {
+                        // first cell on line is not moved:
+                        line->SetPos(line->GetPosX() + s_indent,
+                                     line->GetPosY() + ypos);
+
+                        line = line->GetNext();
+                        for ( int n = 0; line != cell; line = line->GetNext() )
+                        {
+                            if ( line->IsLinebreakAllowed() )
+                            {
+                                // offset the next cell relative to this one
+                                // thus increasing our size
+                                n++;
+                            }
+
+                            line->SetPos(line->GetPosX() + s_indent +
+                                           ((n * step) / total),
+                                           line->GetPosY() + ypos);
+                        }
+                    }
+                    else
+                    {
+                        // this will cause the code to enter "else branch" below:
+                        step = 0;
+                    }
+                }
+                // else branch:
+                if ( step <= 0 ) // no extra space to distribute
+                {
+                    // just set the indent properly
+                    while (line != cell)
+                    {
+                        line->SetPos(line->GetPosX() + s_indent,
+                                     line->GetPosY() + ypos);
+                        line = line->GetNext();
+                    }

                 }
                 }

-                xcnt++;

             }
 
             ypos += ysizedown;
             }
 
             ypos += ysizedown;

-            xpos = xcnt = 0;
+            xpos = 0;

             ysizeup = ysizedown = 0;
             line = cell;
         }
             ysizeup = ysizedown = 0;
             line = cell;
         }


@@ -519,100 +860,116 @@ void wxHtmlContainerCell::Layout(int w)
         m_Height = m_MinHeight;
     }
 
         m_Height = m_MinHeight;
     }
 

+    if (curLineWidth > m_MaxTotalWidth)
+        m_MaxTotalWidth = curLineWidth;
+
+    m_MaxTotalWidth += s_indent + ((m_IndentRight < 0) ? (-m_IndentRight * m_Width / 100) : m_IndentRight);

     MaxLineWidth += s_indent + ((m_IndentRight < 0) ? (-m_IndentRight * m_Width / 100) : m_IndentRight);
     if (m_Width < MaxLineWidth) m_Width = MaxLineWidth;
 
     m_LastLayout = w;
 }
 
     MaxLineWidth += s_indent + ((m_IndentRight < 0) ? (-m_IndentRight * m_Width / 100) : m_IndentRight);
     if (m_Width < MaxLineWidth) m_Width = MaxLineWidth;
 
     m_LastLayout = w;
 }
 

-void wxHtmlContainerCell::UpdateRenderingStatePre(wxHtmlRenderingState& state,
+void wxHtmlContainerCell::UpdateRenderingStatePre(wxHtmlRenderingInfo& info,

                                                   wxHtmlCell *cell) const
 {
                                                   wxHtmlCell *cell) const
 {

-    wxHtmlSelection *s = state.GetSelection();
+    wxHtmlSelection *s = info.GetSelection();

     if (!s) return;
     if (s->GetFromCell() == cell || s->GetToCell() == cell)
     {
     if (!s) return;
     if (s->GetFromCell() == cell || s->GetToCell() == cell)
     {

-        state.SetSelectionState(wxHTML_SEL_CHANGING);
+        info.GetState().SetSelectionState(wxHTML_SEL_CHANGING);

     }
 }
 
     }
 }
 

-void wxHtmlContainerCell::UpdateRenderingStatePost(wxHtmlRenderingState& state,
+void wxHtmlContainerCell::UpdateRenderingStatePost(wxHtmlRenderingInfo& info,

                                                    wxHtmlCell *cell) const
 {
                                                    wxHtmlCell *cell) const
 {

-    wxHtmlSelection *s = state.GetSelection();
+    wxHtmlSelection *s = info.GetSelection();

     if (!s) return;
     if (s->GetToCell() == cell)
     if (!s) return;
     if (s->GetToCell() == cell)

-        state.SetSelectionState(wxHTML_SEL_OUT);
+        info.GetState().SetSelectionState(wxHTML_SEL_OUT);

     else if (s->GetFromCell() == cell)
     else if (s->GetFromCell() == cell)

-        state.SetSelectionState(wxHTML_SEL_IN);
+        info.GetState().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,
 }
 
 #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,

-                               wxHtmlRenderingState& state)
+                               wxHtmlRenderingInfo& info)

 {
 {

-    // container visible, draw it:
-    if ((y + m_PosY <= view_y2) && (y + m_PosY + m_Height > view_y1))
-    {
-        if (m_UseBkColour)
-        {
-            wxBrush myb = wxBrush(m_BkColour, wxSOLID);
+#if 0 // useful for debugging
+    dc.SetPen(*wxRED_PEN);
+    dc.DrawRectangle(x+m_PosX,y+m_PosY,m_Width,m_Height);
+#endif
+            
+    int xlocal = x + m_PosX;
+    int ylocal = y + m_PosY;

 
 

-            int real_y1 = mMax(y + m_PosY, view_y1);
-            int real_y2 = mMin(y + m_PosY + m_Height - 1, view_y2);
+    if (m_UseBkColour)
+    {
+        wxBrush myb = wxBrush(m_BkColour, wxSOLID);

 
 

-            dc.SetBrush(myb);
-            dc.SetPen(*wxTRANSPARENT_PEN);
-            dc.DrawRectangle(x + m_PosX, real_y1, m_Width, real_y2 - real_y1 + 1);
-        }
+        int real_y1 = mMax(ylocal, view_y1);
+        int real_y2 = mMin(ylocal + m_Height - 1, view_y2);

 
 

-        if (m_UseBorder)
-        {
-            wxPen mypen1(m_BorderColour1, 1, wxSOLID);
-            wxPen mypen2(m_BorderColour2, 1, wxSOLID);
+        dc.SetBrush(myb);
+        dc.SetPen(*wxTRANSPARENT_PEN);
+        dc.DrawRectangle(xlocal, real_y1, m_Width, real_y2 - real_y1 + 1);
+    }

 
 

-            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, 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, y + m_PosY + m_Height - 1);
-        }
+    if (m_UseBorder)
+    {
+        wxPen mypen1(m_BorderColour1, 1, wxSOLID);
+        wxPen mypen2(m_BorderColour2, 1, wxSOLID);
+
+        dc.SetPen(mypen1);
+        dc.DrawLine(xlocal, ylocal, xlocal, ylocal + m_Height - 1);
+        dc.DrawLine(xlocal, ylocal, xlocal + m_Width, ylocal);
+        dc.SetPen(mypen2);
+        dc.DrawLine(xlocal + m_Width - 1, ylocal, xlocal +  m_Width - 1, ylocal + m_Height - 1);
+        dc.DrawLine(xlocal, ylocal + m_Height - 1, xlocal + m_Width, ylocal + m_Height - 1);
+    }

 
 

-        if (m_Cells)
+    if (m_Cells)
+    {
+        // draw container's contents:
+        for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext())

         {
         {

-            // draw container's contents:
-            for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext())
+            
+            // optimize drawing: don't render off-screen content:
+            if ((ylocal + cell->GetPosY() <= view_y2) &&
+                (ylocal + cell->GetPosY() + cell->GetHeight() > view_y1))

             {
             {

-                UpdateRenderingStatePre(state, cell);
+                // the cell is visible, draw it:
+                UpdateRenderingStatePre(info, cell);

                 cell->Draw(dc,
                 cell->Draw(dc,

-                           x + m_PosX, y + m_PosY, view_y1, view_y2,
-                           state);
-                UpdateRenderingStatePost(state, cell);
+                           xlocal, ylocal, view_y1, view_y2,
+                           info);
+                UpdateRenderingStatePost(info, cell);
+            }
+            else
+            {
+                // the cell is off-screen, proceed with font+color+etc.
+                // changes only:
+                cell->DrawInvisible(dc, xlocal, ylocal, info);

             }
         }
     }
             }
         }
     }

-    // container invisible, just proceed font+color changing:
-    else
-    {
-        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)
+                                        wxHtmlRenderingInfo& info)

 {
     if (m_Cells)
     {
         for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext())
         {
 {
     if (m_Cells)
     {
         for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext())
         {

-            UpdateRenderingStatePre(state, cell);
-            cell->DrawInvisible(dc, x + m_PosX, y + m_PosY, state);
-            UpdateRenderingStatePost(state, cell);
+            UpdateRenderingStatePre(info, cell);
+            cell->DrawInvisible(dc, x + m_PosX, y + m_PosY, info);
+            UpdateRenderingStatePost(info, cell);

         }
     }
 }
         }
     }
 }


@@ -702,11 +1059,9 @@ const wxHtmlCell* wxHtmlContainerCell::Find(int condition, const void* param) co
 {
     if (m_Cells)
     {
 {
     if (m_Cells)
     {

-        const wxHtmlCell *r = NULL;
-

         for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext())
         {
         for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext())
         {

-            r = cell->Find(condition, param);
+            const wxHtmlCell *r = cell->Find(condition, param);

             if (r) return r;
         }
     }
             if (r) return r;
         }
     }


@@ -734,29 +1089,35 @@ wxHtmlCell *wxHtmlContainerCell::FindCellByPos(wxCoord x, wxCoord y,
     else if ( flags & wxHTML_FIND_NEAREST_AFTER )
     {
         wxHtmlCell *c;
     else if ( flags & wxHTML_FIND_NEAREST_AFTER )
     {
         wxHtmlCell *c;

-        int y2;

         for ( const wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext() )
         {
         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))
+            if ( cell->IsFormattingCell() )

                 continue;
                 continue;

-            c = cell->FindCellByPos(x - cell->GetPosX(), y - cell->GetPosY(),
-                                    flags);
+            int cellY = cell->GetPosY();
+            if (!( y < cellY || (y < cellY + cell->GetHeight() &&
+                                 x < cell->GetPosX() + cell->GetWidth()) ))
+                continue;
+
+            c = cell->FindCellByPos(x - cell->GetPosX(), y - cellY, flags);

             if (c) return c;
         }
     }
     else if ( flags & wxHTML_FIND_NEAREST_BEFORE )
     {
             if (c) return c;
         }
     }
     else if ( flags & wxHTML_FIND_NEAREST_BEFORE )
     {

-        wxHtmlCell *c;
+        wxHtmlCell *c2, *c = NULL;

         for ( const wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext() )
         {
         for ( const wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext() )
         {

-            if (cell->GetPosY() > y || 
-                    (cell->GetPosY() == y && cell->GetPosX() > x))
+            if ( cell->IsFormattingCell() )
+                continue;
+            int cellY = cell->GetPosY();
+            if (!( cellY + cell->GetHeight() <= y ||
+                   (y >= cellY && x >= cell->GetPosX()) ))

                 break;
                 break;

-            c = cell->FindCellByPos(x - cell->GetPosX(), y - cell->GetPosY(),
-                                    flags);
-            if (c) return c;
+            c2 = cell->FindCellByPos(x - cell->GetPosX(), y - cellY, flags);
+            if (c2)
+                c = c2;

         }
         }

+        if (c) return c;

     }
 
     return NULL;
     }
 
     return NULL;


@@ -772,30 +1133,6 @@ void wxHtmlContainerCell::OnMouseClick(wxWindow *parent, int x, int y, const wxM
 
 
 
 
 
 

-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);
-        if (l < cleft)
-            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;
-    if (right)
-        *right = cright;
-}
-
-    

 wxHtmlCell *wxHtmlContainerCell::GetFirstTerminal() const
 {
     if ( m_Cells )
 wxHtmlCell *wxHtmlContainerCell::GetFirstTerminal() const
 {
     if ( m_Cells )


@@ -815,13 +1152,19 @@ wxHtmlCell *wxHtmlContainerCell::GetLastTerminal() const
 {
     if ( m_Cells )
     {
 {
     if ( m_Cells )
     {

-        wxHtmlCell *c, *c2 = NULL;

         // most common case first:
         // most common case first:

-        c = m_LastCell->GetLastTerminal();
+        wxHtmlCell *c = m_LastCell->GetLastTerminal();

         if ( c )
             return c;
         if ( c )
             return c;

-        for (wxHtmlCell *c = m_Cells; c; c = c->GetNext())
-            c2 = c->GetLastTerminal();
+
+        wxHtmlCell *ctmp;
+        wxHtmlCell *c2 = NULL;
+        for (c = m_Cells; c; c = c->GetNext())
+        {
+            ctmp = c->GetLastTerminal();
+            if ( ctmp )
+                c2 = ctmp;
+        }

         return c2;
     }
     else
         return c2;
     }
     else


@@ -829,36 +1172,128 @@ wxHtmlCell *wxHtmlContainerCell::GetLastTerminal() const
 }
 
 
 }
 
 

+static bool IsEmptyContainer(wxHtmlContainerCell *cell)
+{
+    for ( wxHtmlCell *c = cell->GetFirstChild(); c; c = c->GetNext() )
+    {
+        if ( !c->IsTerminalCell() || !c->IsFormattingCell() )
+            return false;
+    }
+    return true;
+}
+
+void wxHtmlContainerCell::RemoveExtraSpacing(bool top, bool bottom)
+{
+    if ( top )
+        SetIndent(0, wxHTML_INDENT_TOP);
+    if ( bottom )
+        SetIndent(0, wxHTML_INDENT_BOTTOM);
+
+    if ( m_Cells )
+    {
+        wxHtmlCell *c;
+        wxHtmlContainerCell *cont;
+        if ( top )
+        {
+            for ( c = m_Cells; c; c = c->GetNext() )
+            {
+                if ( c->IsTerminalCell() )
+                {
+                    if ( !c->IsFormattingCell() )
+                        break;
+                }
+                else
+                {
+                    cont = (wxHtmlContainerCell*)c;
+                    if ( IsEmptyContainer(cont) )
+                    {
+                        cont->SetIndent(0, wxHTML_INDENT_VERTICAL);
+                    }
+                    else
+                    {
+                        cont->RemoveExtraSpacing(true, false);
+                        break;
+                    }
+                }
+            }
+        }
+
+        if ( bottom )
+        {
+            wxArrayPtrVoid arr;
+            for ( c = m_Cells; c; c = c->GetNext() )
+                arr.Add((void*)c);
+
+            for ( int i = arr.GetCount() - 1; i >= 0; i--)
+            {
+                c = (wxHtmlCell*)arr[i];
+                if ( c->IsTerminalCell() )
+                {
+                    if ( !c->IsFormattingCell() )
+                        break;
+                }
+                else
+                {
+                    cont = (wxHtmlContainerCell*)c;
+                    if ( IsEmptyContainer(cont) )
+                    {
+                        cont->SetIndent(0, wxHTML_INDENT_VERTICAL);                                 }
+                    else
+                    {
+                        cont->RemoveExtraSpacing(false, true);
+                        break;
+                    }
+                }
+            }
+        }
+    }
+}
+
+

 
 
 // --------------------------------------------------------------------------
 // wxHtmlColourCell
 // --------------------------------------------------------------------------
 
 
 
 // --------------------------------------------------------------------------
 // wxHtmlColourCell
 // --------------------------------------------------------------------------
 

+IMPLEMENT_ABSTRACT_CLASS(wxHtmlColourCell, wxHtmlCell)
+

 void wxHtmlColourCell::Draw(wxDC& dc,
                             int x, int 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)
+                            wxHtmlRenderingInfo& info)

 {
 {

-    DrawInvisible(dc, x, y, state);
+    DrawInvisible(dc, x, y, info);

 }
 
 void wxHtmlColourCell::DrawInvisible(wxDC& dc,
                                      int WXUNUSED(x), int WXUNUSED(y),
 }
 
 void wxHtmlColourCell::DrawInvisible(wxDC& dc,
                                      int WXUNUSED(x), int WXUNUSED(y),

-                                     wxHtmlRenderingState& state)
+                                     wxHtmlRenderingInfo& info)

 {
 {

+    wxHtmlRenderingState& state = info.GetState();

     if (m_Flags & wxHTML_CLR_FOREGROUND)
     {
         state.SetFgColour(m_Colour);
         if (state.GetSelectionState() != wxHTML_SEL_IN)
     if (m_Flags & wxHTML_CLR_FOREGROUND)
     {
         state.SetFgColour(m_Colour);
         if (state.GetSelectionState() != wxHTML_SEL_IN)

-            dc.SetTextForeground(m_Colour);        
+            dc.SetTextForeground(m_Colour);
+        else
+            dc.SetTextForeground(
+                    info.GetStyle().GetSelectedTextColour(m_Colour));

     }
     if (m_Flags & wxHTML_CLR_BACKGROUND)
     {
         state.SetBgColour(m_Colour);
         if (state.GetSelectionState() != wxHTML_SEL_IN)
     }
     if (m_Flags & wxHTML_CLR_BACKGROUND)
     {
         state.SetBgColour(m_Colour);
         if (state.GetSelectionState() != wxHTML_SEL_IN)

+        {

             dc.SetTextBackground(m_Colour);
             dc.SetTextBackground(m_Colour);

-        dc.SetBackground(wxBrush(m_Colour, wxSOLID));
+            dc.SetBackground(wxBrush(m_Colour, wxSOLID));
+        }
+        else
+        {
+            wxColour c = info.GetStyle().GetSelectedTextBgColour(m_Colour);
+            dc.SetTextBackground(c);
+            dc.SetBackground(wxBrush(c, wxSOLID));
+        }

     }
 }
 
     }
 }
 


@@ -869,16 +1304,18 @@ void wxHtmlColourCell::DrawInvisible(wxDC& dc,
 // wxHtmlFontCell
 // ---------------------------------------------------------------------------
 
 // wxHtmlFontCell
 // ---------------------------------------------------------------------------
 

+IMPLEMENT_ABSTRACT_CLASS(wxHtmlFontCell, wxHtmlCell)
+

 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))
+                          wxHtmlRenderingInfo& WXUNUSED(info))

 {
     dc.SetFont(m_Font);
 }
 
 void wxHtmlFontCell::DrawInvisible(wxDC& dc, int WXUNUSED(x), int WXUNUSED(y),
 {
     dc.SetFont(m_Font);
 }
 
 void wxHtmlFontCell::DrawInvisible(wxDC& dc, int WXUNUSED(x), int WXUNUSED(y),

-                                   wxHtmlRenderingState& WXUNUSED(state))
+                                   wxHtmlRenderingInfo& WXUNUSED(info))

 {
     dc.SetFont(m_Font);
 }
 {
     dc.SetFont(m_Font);
 }


@@ -894,6 +1331,8 @@ void wxHtmlFontCell::DrawInvisible(wxDC& dc, int WXUNUSED(x), int WXUNUSED(y),
 // wxHtmlWidgetCell
 // ---------------------------------------------------------------------------
 
 // wxHtmlWidgetCell
 // ---------------------------------------------------------------------------
 

+IMPLEMENT_ABSTRACT_CLASS(wxHtmlWidgetCell, wxHtmlCell)
+

 wxHtmlWidgetCell::wxHtmlWidgetCell(wxWindow *wnd, int w)
 {
     int sx, sy;
 wxHtmlWidgetCell::wxHtmlWidgetCell(wxWindow *wnd, int w)
 {
     int sx, sy;


@@ -907,7 +1346,7 @@ 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))
+                            wxHtmlRenderingInfo& WXUNUSED(info))

 {
     int absx = 0, absy = 0, stx, sty;
     wxHtmlCell *c = this;
 {
     int absx = 0, absy = 0, stx, sty;
     wxHtmlCell *c = this;


@@ -927,7 +1366,7 @@ void wxHtmlWidgetCell::Draw(wxDC& WXUNUSED(dc),
 
 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))
+                                     wxHtmlRenderingInfo& WXUNUSED(info))

 {
     int absx = 0, absy = 0, stx, sty;
     wxHtmlCell *c = this;
 {
     int absx = 0, absy = 0, stx, sty;
     wxHtmlCell *c = this;


@@ -992,8 +1431,33 @@ const wxHtmlCell* wxHtmlTerminalCellsInterator::operator++()
         while ( m_pos->GetFirstChild() != NULL )
             m_pos = m_pos->GetFirstChild();
     } while ( !m_pos->IsTerminalCell() );
         while ( m_pos->GetFirstChild() != NULL )
             m_pos = m_pos->GetFirstChild();
     } while ( !m_pos->IsTerminalCell() );

-    
+

     return m_pos;
 }
 
     return m_pos;
 }
 

+
+
+
+
+
+
+//-----------------------------------------------------------------------------
+// Cleanup
+//-----------------------------------------------------------------------------
+
+class wxHtmlCellModule: public wxModule
+{
+DECLARE_DYNAMIC_CLASS(wxHtmlCellModule)
+public:
+    wxHtmlCellModule() : wxModule() {}
+    bool OnInit() { return true; }
+    void OnExit()
+    {
+        wxDELETE(gs_cursorLink);
+        wxDELETE(gs_cursorText);
+    }
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxHtmlCellModule, wxModule)
+

 #endif
 #endif