]> git.saurik.com Git - wxWidgets.git/blobdiff - src/html/htmlcell.cpp
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
updated header file name in source
[wxWidgets.git] / src / html / htmlcell.cpp
diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp
index 665db26ff2504aa094bdd955f9519e9f2fe86343..3a100af4d6c65654147fa1d37217c66967ccac9d 100644 (file)
--- a/src/html/htmlcell.cpp
+++ b/src/html/htmlcell.cpp
@@ -1,47 +1,34 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
-// Name:        htmlcell.cpp
+// Name:        src/html/htmlcell.cpp
 // Purpose:     wxHtmlCell - basic element of HTML output
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
 // Purpose:     wxHtmlCell - basic element of HTML output
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "htmlcell.h"
-#endif
-
 #include "wx/wxprec.h"
 
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
-
-#if wxUSE_HTML && wxUSE_STREAMS
-
 #ifdef __BORLANDC__
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #endif
 
+#if wxUSE_HTML && wxUSE_STREAMS
+
 #ifndef WXPRECOMP
 #ifndef WXPRECOMP
+    #include "wx/dynarray.h"
     #include "wx/brush.h"
     #include "wx/colour.h"
     #include "wx/dc.h"
     #include "wx/brush.h"
     #include "wx/colour.h"
     #include "wx/dc.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/html/htmlcell.h"
 #include "wx/html/htmlwin.h"
 #endif
 
 #include "wx/html/htmlcell.h"
 #include "wx/html/htmlwin.h"
-#include "wx/settings.h"
 #include "wx/module.h"
 
 #include <stdlib.h>
 
 #include "wx/module.h"
 
 #include <stdlib.h>
 
-//-----------------------------------------------------------------------------
-// Global variables
-//-----------------------------------------------------------------------------
-
-static wxCursor *gs_cursorLink = NULL;
-static wxCursor *gs_cursorText = NULL;
-
-
 //-----------------------------------------------------------------------------
 // Helper classes
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // Helper classes
 //-----------------------------------------------------------------------------
@@ -61,20 +48,22 @@ void wxHtmlSelection::Set(const wxHtmlCell *fromCell, const wxHtmlCell *toCell)
     wxPoint p2 = toCell ? toCell->GetAbsPos() : wxDefaultPosition;
     if ( toCell )
     {
     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& clr)
+wxColour
+wxDefaultHtmlRenderingStyle::
+GetSelectedTextColour(const wxColour& WXUNUSED(clr))
 {
     return wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
 }
 
 {
     return wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
 }
 
-wxColour wxDefaultHtmlRenderingStyle::GetSelectedTextBgColour(
-                                        const wxColour& WXUNUSED(clr))
+wxColour
+wxDefaultHtmlRenderingStyle::
+GetSelectedTextBgColour(const wxColour& WXUNUSED(clr))
 {
     return wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
 }
 {
     return wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
 }
@@ -84,12 +73,16 @@ wxColour wxDefaultHtmlRenderingStyle::GetSelectedTextBgColour(
 // 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_ScriptMode = wxHTML_SCRIPT_NORMAL;        // <sub> or <sup> mode
+    m_ScriptBaseline = 0;                       // <sub> or <sup> baseline
+    m_CanLiveOnPagebreak = true;
     m_Link = NULL;
 }
 
     m_Link = NULL;
 }
 
@@ -98,46 +91,145 @@ wxHtmlCell::~wxHtmlCell()
     delete m_Link;
 }
 
     delete m_Link;
 }
 
+// Update the descent value when whe are in a <sub> or <sup>.
+// prevbase is the parent base
+void wxHtmlCell::SetScriptMode(wxHtmlScriptMode mode, long previousBase)
+{
+    m_ScriptMode = mode;
+
+    if (mode == wxHTML_SCRIPT_SUP)
+        m_ScriptBaseline = previousBase - (m_Height + 1) / 2;
+    else if (mode == wxHTML_SCRIPT_SUB)
+        m_ScriptBaseline = previousBase + (m_Height + 1) / 6;
+    else
+        m_ScriptBaseline = 0;
+
+    m_Descent += m_ScriptBaseline;
+}
+
+#if WXWIN_COMPATIBILITY_2_6
+
+struct wxHtmlCellOnMouseClickCompatHelper;
+
+static wxHtmlCellOnMouseClickCompatHelper *gs_helperOnMouseClick = NULL;
+
+// helper for routing calls to new ProcessMouseClick() method to deprecated
+// OnMouseClick() method
+struct wxHtmlCellOnMouseClickCompatHelper
+{
+    wxHtmlCellOnMouseClickCompatHelper(wxHtmlWindowInterface *window_,
+                                       const wxPoint& pos_,
+                                       const wxMouseEvent& event_)
+        : window(window_), pos(pos_), event(event_), retval(false)
+    {
+    }
+
+    bool CallOnMouseClick(wxHtmlCell *cell)
+    {
+        wxHtmlCellOnMouseClickCompatHelper *oldHelper = gs_helperOnMouseClick;
+        gs_helperOnMouseClick = this;
+        cell->OnMouseClick
+              (
+                window ? window->GetHTMLWindow() : NULL,
+                pos.x, pos.y,
+                event
+              );
+        gs_helperOnMouseClick = oldHelper;
+        return retval;
+    }
+
+    wxHtmlWindowInterface *window;
+    const wxPoint& pos;
+    const wxMouseEvent& event;
+    bool retval;
+};
+#endif // WXWIN_COMPATIBILITY_2_6
+
+bool wxHtmlCell::ProcessMouseClick(wxHtmlWindowInterface *window,
+                                   const wxPoint& pos,
+                                   const wxMouseEvent& event)
+{
+    wxCHECK_MSG( window, false, _T("window interface must be provided") );
+
+#if WXWIN_COMPATIBILITY_2_6
+    // NB: this hack puts the body of ProcessMouseClick() into OnMouseClick()
+    //     (for which it has to pass the arguments and return value via a
+    //     helper variable because these two methods have different
+    //     signatures), so that old code overriding OnMouseClick will continue
+    //     to work
+    wxHtmlCellOnMouseClickCompatHelper compat(window, pos, event);
+    return compat.CallOnMouseClick(this);
+}
 
 
-void wxHtmlCell::OnMouseClick(wxWindow *parent, int x, int y,
-                              const wxMouseEvent& event)
+void wxHtmlCell::OnMouseClick(wxWindow *, int, int, const wxMouseEvent& event)
 {
 {
-    wxHtmlLinkInfo *lnk = GetLink(x, y);
-    if (lnk != NULL)
+    wxCHECK_RET( gs_helperOnMouseClick, _T("unexpected call to OnMouseClick") );
+    wxHtmlWindowInterface *window = gs_helperOnMouseClick->window;
+    const wxPoint& pos = gs_helperOnMouseClick->pos;
+#endif // WXWIN_COMPATIBILITY_2_6
+
+    wxHtmlLinkInfo *lnk = GetLink(pos.x, pos.y);
+    bool retval = false;
+
+    if (lnk)
     {
         wxHtmlLinkInfo lnk2(*lnk);
         lnk2.SetEvent(&event);
         lnk2.SetHtmlCell(this);
 
     {
         wxHtmlLinkInfo lnk2(*lnk);
         lnk2.SetEvent(&event);
         lnk2.SetHtmlCell(this);
 
-        // note : this cast is legal because parent is *always* wxHtmlWindow
-        wxStaticCast(parent, wxHtmlWindow)->OnLinkClicked(lnk2);
+        window->OnHTMLLinkClicked(lnk2);
+        retval = true;
     }
     }
-}
 
 
+#if WXWIN_COMPATIBILITY_2_6
+    gs_helperOnMouseClick->retval = retval;
+#else
+    return retval;
+#endif // WXWIN_COMPATIBILITY_2_6
+}
 
 
+#if WXWIN_COMPATIBILITY_2_6
 wxCursor wxHtmlCell::GetCursor() const
 {
 wxCursor wxHtmlCell::GetCursor() const
 {
+    return wxNullCursor;
+}
+#endif // WXWIN_COMPATIBILITY_2_6
+
+wxCursor wxHtmlCell::GetMouseCursor(wxHtmlWindowInterface *window) const
+{
+#if WXWIN_COMPATIBILITY_2_6
+    // NB: Older versions of wx used GetCursor() virtual method in place of
+    //     GetMouseCursor(interface). This code ensures that user code that
+    //     overriden GetCursor() continues to work. The trick is that the base
+    //     wxHtmlCell::GetCursor() method simply returns wxNullCursor, so we
+    //     know that GetCursor() was overriden iff it returns valid cursor.
+    wxCursor cur = GetCursor();
+    if (cur.Ok())
+        return cur;
+#endif // WXWIN_COMPATIBILITY_2_6
+
     if ( GetLink() )
     {
     if ( GetLink() )
     {
-        if ( !gs_cursorLink )
-            gs_cursorLink = new wxCursor(wxCURSOR_HAND);
-        return *gs_cursorLink;
+        return window->GetHTMLCursor(wxHtmlWindowInterface::HTMLCursor_Link);
     }
     else
     }
     else
-        return *wxSTANDARD_CURSOR;
+    {
+        return window->GetHTMLCursor(wxHtmlWindowInterface::HTMLCursor_Default);
+    }
 }
 
 
 }
 
 
-bool wxHtmlCell::AdjustPagebreak(int *pagebreak, int* WXUNUSED(known_pagebreaks), int WXUNUSED(number_of_pages)) const
+bool wxHtmlCell::AdjustPagebreak(int *pagebreak,
+                                 wxArrayInt& WXUNUSED(known_pagebreaks)) const
 {
     if ((!m_CanLiveOnPagebreak) &&
                 m_PosY < *pagebreak && m_PosY + m_Height > *pagebreak)
     {
         *pagebreak = m_PosY;
 {
     if ((!m_CanLiveOnPagebreak) &&
                 m_PosY < *pagebreak && m_PosY + m_Height > *pagebreak)
     {
         *pagebreak = m_PosY;
-        return TRUE;
+        return true;
     }
 
     }
 
-    return FALSE;
+    return false;
 }
 
 
 }
 
 
@@ -158,16 +250,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;
@@ -184,10 +266,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;
@@ -195,10 +277,11 @@ wxHtmlCell *wxHtmlCell::FindCellByPos(wxCoord x, wxCoord y,
 }
 
 
 }
 
 
-wxPoint wxHtmlCell::GetAbsPos() const
+wxPoint wxHtmlCell::GetAbsPos(wxHtmlCell *rootCell) const
 {
     wxPoint p(m_PosX, m_PosY);
 {
     wxPoint p(m_PosX, m_PosY);
-    for (wxHtmlCell *parent = m_Parent; parent; parent = parent->m_Parent)
+    for (wxHtmlCell *parent = m_Parent; parent && parent != rootCell;
+         parent = parent->m_Parent)
     {
         p.x += parent->m_PosX;
         p.y += parent->m_PosY;
     {
         p.x += parent->m_PosX;
         p.y += parent->m_PosY;
@@ -206,6 +289,14 @@ wxPoint wxHtmlCell::GetAbsPos() const
     return p;
 }
 
     return p;
 }
 
+wxHtmlCell *wxHtmlCell::GetRootCell() const
+{
+    wxHtmlCell *c = wxConstCast(this, wxHtmlCell);
+    while ( c->m_Parent )
+        c = c->m_Parent;
+    return c;
+}
+
 unsigned wxHtmlCell::GetDepth() const
 {
     unsigned d = 0;
 unsigned wxHtmlCell::GetDepth() const
 {
     unsigned d = 0;
@@ -259,32 +350,57 @@ bool wxHtmlCell::IsBefore(wxHtmlCell *cell) const
 // wxHtmlWordCell
 //-----------------------------------------------------------------------------
 
 // wxHtmlWordCell
 //-----------------------------------------------------------------------------
 
-wxHtmlWordCell::wxHtmlWordCell(const wxString& word, wxDC& dc) : wxHtmlCell()
+IMPLEMENT_ABSTRACT_CLASS(wxHtmlWordCell, wxHtmlCell)
+
+wxHtmlWordCell::wxHtmlWordCell(const wxString& word, const wxDC& dc) : wxHtmlCell()
 {
     m_Word = word;
     dc.GetTextExtent(m_Word, &m_Width, &m_Height, &m_Descent);
 {
     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:
 
 // 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,
+void wxHtmlWordCell::Split(const wxDC& dc,
                            const wxPoint& selFrom, const wxPoint& selTo,
                            unsigned& pos1, unsigned& pos2) const
 {
     wxPoint pt1 = (selFrom == wxDefaultPosition) ?
                    wxDefaultPosition : selFrom - GetAbsPos();
     wxPoint pt2 = (selTo == wxDefaultPosition) ?
                            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, -1) : selTo - GetAbsPos();
+                   wxPoint(m_Width, wxDefaultCoord) : selTo - GetAbsPos();
 
 
-    wxCoord charW, charH;
     unsigned len = m_Word.length();
     unsigned i = 0;
     pos1 = 0;
 
     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:
     // before selection:
+#ifdef __WXMAC__
+    // implementation using PartialExtents to support fractional widths
+    wxArrayInt widths ;
+    dc.GetPartialTextExtents(m_Word,widths) ;
+    while( i < len && pt1.x >= widths[i] )
+        i++ ;
+#else // __WXMAC__
+    wxCoord charW, charH;
     while ( pt1.x > 0 && i < len )
     {
         dc.GetTextExtent(m_Word[i], &charW, &charH);
     while ( pt1.x > 0 && i < len )
     {
         dc.GetTextExtent(m_Word[i], &charW, &charH);
@@ -295,9 +411,14 @@ void wxHtmlWordCell::Split(wxDC& dc,
             i++;
         }
     }
             i++;
         }
     }
+#endif // __WXMAC__/!__WXMAC__
 
     // in selection:
     unsigned j = i;
 
     // in selection:
     unsigned j = i;
+#ifdef __WXMAC__
+    while( j < len && pt2.x >= widths[j] )
+        j++ ;
+#else // __WXMAC__
     pos2 = pos1;
     pt2.x -= pos2;
     while ( pt2.x > 0 && j < len )
     pos2 = pos1;
     pt2.x -= pos2;
     while ( pt2.x > 0 && j < len )
@@ -310,12 +431,13 @@ void wxHtmlWordCell::Split(wxDC& dc,
             j++;
         }
     }
             j++;
         }
     }
+#endif // __WXMAC__/!__WXMAC__
 
     pos1 = i;
     pos2 = j;
 }
 
 
     pos1 = i;
     pos2 = j;
 }
 
-void wxHtmlWordCell::SetSelectionPrivPos(wxDC& dc, wxHtmlSelection *s) const
+void wxHtmlWordCell::SetSelectionPrivPos(const wxDC& dc, wxHtmlSelection *s) const
 {
     unsigned p1, p2;
 
 {
     unsigned p1, p2;
 
@@ -349,12 +471,15 @@ static void SwitchSelState(wxDC& dc, wxHtmlRenderingInfo& info,
         dc.SetBackgroundMode(wxSOLID);
         dc.SetTextForeground(info.GetStyle().GetSelectedTextColour(fg));
         dc.SetTextBackground(info.GetStyle().GetSelectedTextBgColour(bg));
         dc.SetBackgroundMode(wxSOLID);
         dc.SetTextForeground(info.GetStyle().GetSelectedTextColour(fg));
         dc.SetTextBackground(info.GetStyle().GetSelectedTextBgColour(bg));
+        dc.SetBackground(wxBrush(info.GetStyle().GetSelectedTextBgColour(bg),
+                                 wxSOLID));
     }
     else
     {
         dc.SetBackgroundMode(wxTRANSPARENT);
         dc.SetTextForeground(fg);
         dc.SetTextBackground(bg);
     }
     else
     {
         dc.SetBackgroundMode(wxTRANSPARENT);
         dc.SetTextForeground(fg);
         dc.SetTextBackground(bg);
+        dc.SetBackground(wxBrush(bg, wxSOLID));
     }
 }
 
     }
 }
 
@@ -364,9 +489,12 @@ void wxHtmlWordCell::Draw(wxDC& dc, int x, int y,
                           wxHtmlRenderingInfo& info)
 {
 #if 0 // useful for debugging
                           wxHtmlRenderingInfo& info)
 {
 #if 0 // useful for debugging
-    dc.DrawRectangle(x+m_PosX,y+m_PosY,m_Width,m_Height);
+    dc.SetPen(*wxBLACK_PEN);
+    dc.DrawRectangle(x+m_PosX,y+m_PosY,m_Width /* VZ: +1? */ ,m_Height);
 #endif
 
 #endif
 
+    bool drawSelectionAfterCell = false;
+
     if ( info.GetState().GetSelectionState() == wxHTML_SEL_CHANGING )
     {
         // Selection changing, we must draw the word piecewise:
     if ( info.GetState().GetSelectionState() == wxHTML_SEL_CHANGING )
     {
         // Selection changing, we must draw the word piecewise:
@@ -414,22 +542,49 @@ void wxHtmlWordCell::Draw(wxDC& dc, int x, int y,
             txt = m_Word.Mid(part2);
             dc.DrawText(txt, ofs + x + m_PosX, y + m_PosY);
         }
             txt = m_Word.Mid(part2);
             dc.DrawText(txt, ofs + x + m_PosX, y + m_PosY);
         }
+        else
+            drawSelectionAfterCell = true;
     }
     else
     {
     }
     else
     {
+        wxHtmlSelectionState selstate = info.GetState().GetSelectionState();
         // Not changing selection state, draw the word in single mode:
         // Not changing selection state, draw the word in single mode:
-
-        if ( info.GetState().GetSelectionState() != wxHTML_SEL_OUT &&
+        if ( selstate != wxHTML_SEL_OUT &&
              dc.GetBackgroundMode() != wxSOLID )
         {
             SwitchSelState(dc, info, true);
         }
              dc.GetBackgroundMode() != wxSOLID )
         {
             SwitchSelState(dc, info, true);
         }
-        else if ( info.GetState().GetSelectionState() == wxHTML_SEL_OUT &&
+        else if ( selstate == wxHTML_SEL_OUT &&
                   dc.GetBackgroundMode() == wxSOLID )
         {
             SwitchSelState(dc, info, false);
         }
         dc.DrawText(m_Word, x + m_PosX, y + m_PosY);
                   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);
+            }
+        }
     }
 }
 
     }
 }
 
@@ -460,16 +615,16 @@ wxString wxHtmlWordCell::ConvertToText(wxHtmlSelection *s) const
     return m_Word;
 }
 
     return m_Word;
 }
 
-wxCursor wxHtmlWordCell::GetCursor() const
+wxCursor wxHtmlWordCell::GetMouseCursor(wxHtmlWindowInterface *window) const
 {
     if ( !GetLink() )
     {
 {
     if ( !GetLink() )
     {
-        if ( !gs_cursorText )
-            gs_cursorText = new wxCursor(wxCURSOR_IBEAM);
-        return *gs_cursorText;
+        return window->GetHTMLCursor(wxHtmlWindowInterface::HTMLCursor_Text);
     }
     else
     }
     else
-        return wxHtmlCell::GetCursor();
+    {
+        return wxHtmlCell::GetMouseCursor(window);
+    }
 }
 
 
 }
 
 
@@ -477,18 +632,20 @@ wxCursor wxHtmlWordCell::GetCursor() const
 // 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;
@@ -533,7 +690,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;
@@ -543,32 +700,28 @@ int wxHtmlContainerCell::GetIndentUnits(int ind) const
 }
 
 
 }
 
 
-
-bool wxHtmlContainerCell::AdjustPagebreak(int *pagebreak, int* known_pagebreaks, int number_of_pages) const
+bool wxHtmlContainerCell::AdjustPagebreak(int *pagebreak,
+                                          wxArrayInt& known_pagebreaks) const
 {
     if (!m_CanLiveOnPagebreak)
 {
     if (!m_CanLiveOnPagebreak)
-        return wxHtmlCell::AdjustPagebreak(pagebreak, known_pagebreaks, number_of_pages);
+        return wxHtmlCell::AdjustPagebreak(pagebreak, known_pagebreaks);
 
 
-    else
-    {
-        wxHtmlCell *c = GetFirstChild();
-        bool rt = FALSE;
-        int pbrk = *pagebreak - m_PosY;
+    wxHtmlCell *c = GetFirstChild();
+    bool rt = false;
+    int pbrk = *pagebreak - m_PosY;
 
 
-        while (c)
-        {
-            if (c->AdjustPagebreak(&pbrk, known_pagebreaks, number_of_pages))
-                rt = TRUE;
-            c = c->GetNext();
-        }
-        if (rt)
-            *pagebreak = pbrk + m_PosY;
-        return rt;
+    while (c)
+    {
+        if (c->AdjustPagebreak(&pbrk, known_pagebreaks))
+            rt = true;
+        c = c->GetNext();
     }
     }
+    if (rt)
+        *pagebreak = pbrk + m_PosY;
+    return rt;
 }
 
 
 }
 
 
-
 void wxHtmlContainerCell::Layout(int w)
 {
     wxHtmlCell::Layout(w);
 void wxHtmlContainerCell::Layout(int w)
 {
     wxHtmlCell::Layout(w);
@@ -589,13 +742,14 @@ void wxHtmlContainerCell::Layout(int w)
        return;
     }
 
        return;
     }
 
-    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;
 
 
     /*
 
 
     /*
@@ -634,6 +788,8 @@ void wxHtmlContainerCell::Layout(int w)
     s_width = m_Width - s_indent - ((m_IndentRight < 0) ? (-m_IndentRight * m_Width / 100) : m_IndentRight);
 
     // my own layouting:
     s_width = m_Width - s_indent - ((m_IndentRight < 0) ? (-m_IndentRight * m_Width / 100) : m_IndentRight);
 
     // my own layouting:
+    wxHtmlCell *cell = m_Cells,
+               *line = m_Cells;
     while (cell != NULL)
     {
         switch (m_AlignVer)
     while (cell != NULL)
     {
         switch (m_AlignVer)
@@ -647,13 +803,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++;
 
 
-        // force new line if occured:
-        if ((cell == NULL) || (xpos + cell->GetWidth() > s_width))
+        // 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 occurred:
+        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;
@@ -676,30 +859,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;
         }
@@ -724,6 +965,10 @@ 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;
 
     MaxLineWidth += s_indent + ((m_IndentRight < 0) ? (-m_IndentRight * m_Width / 100) : m_IndentRight);
     if (m_Width < MaxLineWidth) m_Width = MaxLineWidth;
 
@@ -758,52 +1003,64 @@ void wxHtmlContainerCell::UpdateRenderingStatePost(wxHtmlRenderingInfo& info,
 void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
                                wxHtmlRenderingInfo& info)
 {
 void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
                                wxHtmlRenderingInfo& info)
 {
-    // container visible, draw it:
-    if ((y + m_PosY <= view_y2) && (y + m_PosY + m_Height > view_y1))
+#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;
+
+    if (m_UseBkColour)
     {
     {
-        if (m_UseBkColour)
-        {
-            wxBrush myb = wxBrush(m_BkColour, wxSOLID);
+        wxBrush myb = wxBrush(m_BkColour, wxSOLID);
 
 
-            int real_y1 = mMax(y + m_PosY, view_y1);
-            int real_y2 = mMin(y + m_PosY + m_Height - 1, view_y2);
+        int real_y1 = mMax(ylocal, view_y1);
+        int real_y2 = mMin(ylocal + m_Height - 1, view_y2);
 
 
-            dc.SetBrush(myb);
-            dc.SetPen(*wxTRANSPARENT_PEN);
-            dc.DrawRectangle(x + m_PosX, real_y1, m_Width, real_y2 - real_y1 + 1);
-        }
+        dc.SetBrush(myb);
+        dc.SetPen(*wxTRANSPARENT_PEN);
+        dc.DrawRectangle(xlocal, real_y1, m_Width, real_y2 - real_y1 + 1);
+    }
 
 
-        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, 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))
             {
             {
+                // the cell is visible, draw it:
                 UpdateRenderingStatePre(info, cell);
                 cell->Draw(dc,
                 UpdateRenderingStatePre(info, cell);
                 cell->Draw(dc,
-                           x + m_PosX, y + m_PosY, view_y1, view_y2,
+                           xlocal, ylocal, view_y1, view_y2,
                            info);
                 UpdateRenderingStatePost(info, cell);
             }
                            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, info);
-    }
 }
 
 
 }
 
 
@@ -887,7 +1144,7 @@ void wxHtmlContainerCell::SetWidthFloat(const wxHtmlTag& tag, double pixel_scale
         int wdi;
         wxString wd = tag.GetParam(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);
         {
             wxSscanf(wd.c_str(), wxT("%i%%"), &wdi);
             SetWidthFloat(wdi, wxHTML_UNITS_PERCENT);
@@ -907,11 +1164,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;
         }
     }
@@ -939,14 +1194,16 @@ 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;
         }
     }
             if (c) return c;
         }
     }
@@ -955,11 +1212,13 @@ wxHtmlCell *wxHtmlContainerCell::FindCellByPos(wxCoord x, wxCoord y,
         wxHtmlCell *c2, *c = NULL;
         for ( const wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext() )
         {
         wxHtmlCell *c2, *c = NULL;
         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;
-            c2 = cell->FindCellByPos(x - cell->GetPosX(), y - cell->GetPosY(),
-                                     flags);
+            c2 = cell->FindCellByPos(x - cell->GetPosX(), y - cellY, flags);
             if (c2)
                 c = c2;
         }
             if (c2)
                 c = c2;
         }
@@ -970,36 +1229,33 @@ wxHtmlCell *wxHtmlContainerCell::FindCellByPos(wxCoord x, wxCoord y,
 }
 
 
 }
 
 
-void wxHtmlContainerCell::OnMouseClick(wxWindow *parent, int x, int y, const wxMouseEvent& event)
+bool wxHtmlContainerCell::ProcessMouseClick(wxHtmlWindowInterface *window,
+                                            const wxPoint& pos,
+                                            const wxMouseEvent& event)
 {
 {
-    wxHtmlCell *cell = FindCellByPos(x, y);
-    if ( cell )
-        cell->OnMouseClick(parent, x, y, event);
+#if WXWIN_COMPATIBILITY_2_6
+    wxHtmlCellOnMouseClickCompatHelper compat(window, pos, event);
+    return compat.CallOnMouseClick(this);
 }
 
 }
 
-
-
-void wxHtmlContainerCell::GetHorizontalConstraints(int *left, int *right) const
+void wxHtmlContainerCell::OnMouseClick(wxWindow*,
+                                       int, int, const wxMouseEvent& event)
 {
 {
-    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;
-    }
+    wxCHECK_RET( gs_helperOnMouseClick, _T("unexpected call to OnMouseClick") );
+    wxHtmlWindowInterface *window = gs_helperOnMouseClick->window;
+    const wxPoint& pos = gs_helperOnMouseClick->pos;
+#endif // WXWIN_COMPATIBILITY_2_6
 
 
-    cleft -= (m_IndentLeft < 0) ? (-m_IndentLeft * m_Width / 100) : m_IndentLeft;
-    cright += (m_IndentRight < 0) ? (-m_IndentRight * m_Width / 100) : m_IndentRight;
+    bool retval = false;
+    wxHtmlCell *cell = FindCellByPos(pos.x, pos.y);
+    if ( cell )
+        retval = cell->ProcessMouseClick(window, pos, event);
 
 
-    if (left)
-        *left = cleft;
-    if (right)
-        *right = cright;
+#if WXWIN_COMPATIBILITY_2_6
+    gs_helperOnMouseClick->retval = retval;
+#else
+    return retval;
+#endif // WXWIN_COMPATIBILITY_2_6
 }
 
 
 }
 
 
@@ -1027,9 +1283,14 @@ wxHtmlCell *wxHtmlContainerCell::GetLastTerminal() const
         if ( c )
             return c;
 
         if ( c )
             return c;
 
+        wxHtmlCell *ctmp;
         wxHtmlCell *c2 = NULL;
         for (c = m_Cells; c; c = c->GetNext())
         wxHtmlCell *c2 = NULL;
         for (c = m_Cells; c; c = c->GetNext())
-            c2 = c->GetLastTerminal();
+        {
+            ctmp = c->GetLastTerminal();
+            if ( ctmp )
+                c2 = ctmp;
+        }
         return c2;
     }
     else
         return c2;
     }
     else
@@ -1037,12 +1298,93 @@ 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),
@@ -1069,11 +1411,16 @@ void wxHtmlColourCell::DrawInvisible(wxDC& dc,
     {
         state.SetBgColour(m_Colour);
         if (state.GetSelectionState() != wxHTML_SEL_IN)
     {
         state.SetBgColour(m_Colour);
         if (state.GetSelectionState() != wxHTML_SEL_IN)
+        {
             dc.SetTextBackground(m_Colour);
             dc.SetTextBackground(m_Colour);
+            dc.SetBackground(wxBrush(m_Colour, wxSOLID));
+        }
         else
         else
-            dc.SetTextBackground(
-                    info.GetStyle().GetSelectedTextBgColour(m_Colour));
-        dc.SetBackground(wxBrush(m_Colour, wxSOLID));
+        {
+            wxColour c = info.GetStyle().GetSelectedTextBgColour(m_Colour);
+            dc.SetTextBackground(c);
+            dc.SetBackground(wxBrush(c, wxSOLID));
+        }
     }
 }
 
     }
 }
 
@@ -1084,6 +1431,8 @@ 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),
@@ -1109,6 +1458,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;
@@ -1211,29 +1562,4 @@ const wxHtmlCell* wxHtmlTerminalCellsInterator::operator++()
     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
wxWidgets (Impactor)