Provide empty stubs for constructors

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

diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp
index a57c6320d9b259755983b27a1bed09d2f71659a3..665db26ff2504aa094bdd955f9519e9f2fe86343 100644 (file)
--- a/src/html/htmlcell.cpp
+++ b/src/html/htmlcell.cpp
@@ -30,14 +30,24 @@
 #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 <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,7 +55,7 @@ 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;
 {
     wxPoint p1 = fromCell ? fromCell->GetAbsPos() : wxDefaultPosition;
     wxPoint p2 = toCell ? toCell->GetAbsPos() : wxDefaultPosition;


@@ -57,6 +67,19 @@ void wxHtmlSelection::Set(wxHtmlCell *fromCell, wxHtmlCell *toCell)
     Set(p1, fromCell, p2, toCell);
 }
 
     Set(p1, fromCell, p2, toCell);
 }
 

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

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


@@ -92,6 +115,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
 {


@@ -116,7 +151,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);


@@ -171,7 +205,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 +213,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 +240,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


@@ -236,10 +270,9 @@ wxHtmlWordCell::wxHtmlWordCell(const wxString& word, wxDC& dc) : wxHtmlCell()
 // 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(wxDC& dc,

                            const wxPoint& selFrom, const wxPoint& selTo,
                            const wxPoint& selFrom, const wxPoint& selTo,

-                           wxString& s1, wxString& s2, wxString& s3,
-                           unsigned& pos1, unsigned& pos2)
+                           unsigned& pos1, unsigned& pos2) const

 {
     wxPoint pt1 = (selFrom == wxDefaultPosition) ?
                    wxDefaultPosition : selFrom - GetAbsPos();
 {
     wxPoint pt1 = (selFrom == wxDefaultPosition) ?
                    wxDefaultPosition : selFrom - GetAbsPos();


@@ -250,7 +283,6 @@ void wxHtmlWordCell::Split(wxDC& dc,
     unsigned len = m_Word.length();
     unsigned i = 0;
     pos1 = 0;
     unsigned len = m_Word.length();
     unsigned i = 0;
     pos1 = 0;

-    s1 = s2 = s3 = wxEmptyString;

 
     // before selection:
     while ( pt1.x > 0 && i < len )
 
     // before selection:
     while ( pt1.x > 0 && i < len )


@@ -267,7 +299,7 @@ void wxHtmlWordCell::Split(wxDC& dc,
     // in selection:
     unsigned j = i;
     pos2 = pos1;
     // in selection:
     unsigned j = i;
     pos2 = pos1;

-        pt2.x -= pos2;
+    pt2.x -= pos2;

     while ( pt2.x > 0 && j < len )
     {
         dc.GetTextExtent(m_Word[j], &charW, &charH);
     while ( pt2.x > 0 && j < len )
     {
         dc.GetTextExtent(m_Word[j], &charW, &charH);


@@ -278,98 +310,167 @@ void wxHtmlWordCell::Split(wxDC& dc,
             j++;
         }
     }
             j++;
         }
     }

-    
-    s1 = m_Word.Mid(0, i);
-    s2 = m_Word.Mid(i, j-i);
-    s3 = m_Word.Mid(j);
-#if 0 // FIXME
-    printf("  '%s' %i '%s' %i '%s'\n", s1.mb_str(), pos1,
-            s2.mb_str(), pos2,s3.mb_str());
-#endif
+
+    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);

 
 

-static void SwitchSelState(wxDC& dc, wxHtmlRenderingState& state,
+    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)
 {
                            bool toSelection)
 {

+    wxColour fg = info.GetState().GetFgColour();
+    wxColour bg = info.GetState().GetBgColour();
+

     if ( toSelection )
     {
         dc.SetBackgroundMode(wxSOLID);
     if ( toSelection )
     {
         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));

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

-        dc.SetTextForeground(state.GetFgColour());
-        dc.SetTextBackground(state.GetBgColour());
+        dc.SetTextForeground(fg);
+        dc.SetTextBackground(bg);

     }
 }
 
 
 void wxHtmlWordCell::Draw(wxDC& dc, int x, int y,
                           int WXUNUSED(view_y1), int WXUNUSED(view_y2),
     }
 }
 
 
 void wxHtmlWordCell::Draw(wxDC& dc, int x, int y,
                           int WXUNUSED(view_y1), int WXUNUSED(view_y2),

-                          wxHtmlRenderingState& state)
+                          wxHtmlRenderingInfo& info)

 {
 #if 0 // useful for debugging
     dc.DrawRectangle(x+m_PosX,y+m_PosY,m_Width,m_Height);
 #endif
 
 {
 #if 0 // useful for debugging
     dc.DrawRectangle(x+m_PosX,y+m_PosY,m_Width,m_Height);
 #endif
 

-    if ( state.GetSelectionState() == wxHTML_SEL_CHANGING )
+    if ( info.GetState().GetSelectionState() == wxHTML_SEL_CHANGING )

     {
         // Selection changing, we must draw the word piecewise:
     {
         // Selection changing, we must draw the word piecewise:

-    
-        unsigned ofs1, ofs2;
-        wxString textBefore, textInside, textAfter;
-        wxHtmlSelection *s = state.GetSelection();
-        
-        Split(dc, 
-              this == s->GetFromCell() ? s->GetFromPos() : wxDefaultPosition,
-              this == s->GetToCell() ? s->GetToPos() : wxDefaultPosition,
-              textBefore, textInside, textAfter, ofs1, ofs2);
-        dc.DrawText(textBefore, x + m_PosX, y + m_PosY);
-        int w1,w2,w3,h123;
-        dc.GetTextExtent(textBefore, &w1,&h123);
-        dc.GetTextExtent(textInside, &w2,&h123);
-        dc.GetTextExtent(textAfter, &w3,&h123);
-        if ( !textInside.empty() )
+        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 )

         {
         {

-            SwitchSelState(dc, state, true);
-            dc.DrawText(textInside, x + m_PosX + ofs1, y + m_PosY);
+            SetSelectionPrivPos(dc, s);
+            priv = (this == s->GetFromCell()) ?
+                    s->GetFromPrivPos() : s->GetToPrivPos();

         }
         }

-        if ( !textAfter.empty() )
+
+        int part1 = priv.x;
+        int part2 = priv.y;
+
+        if ( part1 > 0 )

         {
         {

-            SwitchSelState(dc, state, false);
-            dc.DrawText(textAfter, x + m_PosX + ofs2, y + m_PosY);
+            txt = m_Word.Mid(0, part1);
+            dc.DrawText(txt, x + m_PosX, y + m_PosY);
+            dc.GetTextExtent(txt, &w, &h);
+            ofs += w;
+        }
+
+        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
     {
         // Not changing selection state, draw the word in single mode:
 
         }
     }
     else
     {
         // Not changing selection state, draw the word in single mode:
 

-        if ( state.GetSelectionState() != wxHTML_SEL_OUT &&
+        if ( info.GetState().GetSelectionState() != wxHTML_SEL_OUT &&

              dc.GetBackgroundMode() != wxSOLID )
         {
              dc.GetBackgroundMode() != wxSOLID )
         {

-            SwitchSelState(dc, state, true);
+            SwitchSelState(dc, info, true);

         }
         }

-        else if ( state.GetSelectionState() == wxHTML_SEL_OUT &&
+        else if ( info.GetState().GetSelectionState() == wxHTML_SEL_OUT &&

                   dc.GetBackgroundMode() == wxSOLID )
         {
                   dc.GetBackgroundMode() == wxSOLID )
         {

-            SwitchSelState(dc, state, false);
+            SwitchSelState(dc, info, false);

         }
         dc.DrawText(m_Word, x + m_PosX, y + m_PosY);
     }
 }
         }
         dc.DrawText(m_Word, x + m_PosX, y + m_PosY);
     }
 }

-    

 
 

-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();
+}

 
 
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------


@@ -629,33 +730,33 @@ void wxHtmlContainerCell::Layout(int w)
     m_LastLayout = w;
 }
 
     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))
 {
     // container visible, draw it:
     if ((y + m_PosY <= view_y2) && (y + m_PosY + m_Height > view_y1))


@@ -690,33 +791,33 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
             // 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())
             {

-                UpdateRenderingStatePre(state, cell);
+                UpdateRenderingStatePre(info, cell);

                 cell->Draw(dc,
                            x + m_PosX, y + m_PosY, view_y1, view_y2,
                 cell->Draw(dc,
                            x + m_PosX, y + m_PosY, view_y1, view_y2,

-                           state);
-                UpdateRenderingStatePost(state, cell);
+                           info);
+                UpdateRenderingStatePost(info, cell);

             }
         }
     }
     // container invisible, just proceed font+color changing:
     else
     {
             }
         }
     }
     // container invisible, just proceed font+color changing:
     else
     {

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

     }
 }
 
 
 
 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);

         }
     }
 }
         }
     }
 }


@@ -854,7 +955,7 @@ 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 || 
+            if (cell->GetPosY() > y ||

                     (cell->GetPosY() == y && cell->GetPosX() > x))
                 break;
             c2 = cell->FindCellByPos(x - cell->GetPosX(), y - cell->GetPosY(),
                     (cell->GetPosY() == y && cell->GetPosX() > x))
                 break;
             c2 = cell->FindCellByPos(x - cell->GetPosX(), y - cell->GetPosY(),


@@ -901,7 +1002,7 @@ void wxHtmlContainerCell::GetHorizontalConstraints(int *left, int *right) const
         *right = cright;
 }
 
         *right = cright;
 }
 

-    
+

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


@@ -945,26 +1046,33 @@ wxHtmlCell *wxHtmlContainerCell::GetLastTerminal() const
 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)
             dc.SetTextBackground(m_Colour);
     }
     if (m_Flags & wxHTML_CLR_BACKGROUND)
     {
         state.SetBgColour(m_Colour);
         if (state.GetSelectionState() != wxHTML_SEL_IN)
             dc.SetTextBackground(m_Colour);

+        else
+            dc.SetTextBackground(
+                    info.GetStyle().GetSelectedTextBgColour(m_Colour));

         dc.SetBackground(wxBrush(m_Colour, wxSOLID));
     }
 }
         dc.SetBackground(wxBrush(m_Colour, wxSOLID));
     }
 }


@@ -979,13 +1087,13 @@ void wxHtmlColourCell::DrawInvisible(wxDC& dc,
 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);
 }


@@ -1014,7 +1122,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;


@@ -1034,7 +1142,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;


@@ -1099,8 +1207,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