#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>
+//-----------------------------------------------------------------------------
+// Global variables
+//-----------------------------------------------------------------------------
+
+static wxCursor *gs_cursorLink = NULL;
+static wxCursor *gs_cursorText = NULL;
+
+
//-----------------------------------------------------------------------------
// 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_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;
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
//-----------------------------------------------------------------------------
}
+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
{
}
-
void wxHtmlCell::Layout(int WXUNUSED(w))
{
SetPos(0, 0);
-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;
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) &&
- (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 p;
}
-
+
unsigned wxHtmlCell::GetDepth() const
{
unsigned d = 0;
d++;
return d;
}
-
+
bool wxHtmlCell::IsBefore(wxHtmlCell *cell) const
{
const wxHtmlCell *c1 = this;
if ( c1 == c2 )
return true;
c1 = c1->GetNext();
- }
+ }
return false;
}
else
m_Word = word;
dc.GetTextExtent(m_Word, &m_Width, &m_Height, &m_Descent);
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,
+void wxHtmlWordCell::Split(wxDC& dc,
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();
unsigned len = m_Word.length();
unsigned i = 0;
pos1 = 0;
- s1 = s2 = s3 = wxEmptyString;
+
+ // 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 )
// 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);
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);
+
+ 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, wxHtmlRenderingState& state,
+static void SwitchSelState(wxDC& dc, wxHtmlRenderingInfo& info,
bool toSelection)
{
+ wxColour fg = info.GetState().GetFgColour();
+ wxColour bg = info.GetState().GetBgColour();
+
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));
+ dc.SetBackground(wxBrush(info.GetStyle().GetSelectedTextBgColour(bg),
+ wxSOLID));
}
else
{
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),
- wxHtmlRenderingState& state)
+ wxHtmlRenderingInfo& info)
{
#if 0 // useful for debugging
+ dc.SetPen(*wxBLACK_PEN);
dc.DrawRectangle(x+m_PosX,y+m_PosY,m_Width,m_Height);
#endif
- if ( state.GetSelectionState() == wxHTML_SEL_CHANGING )
+ bool drawSelectionAfterCell = false;
+
+ if ( info.GetState().GetSelectionState() == wxHTML_SEL_CHANGING )
{
// 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
+ drawSelectionAfterCell = true;
}
else
{
+ wxHtmlSelectionState selstate = info.GetState().GetSelectionState();
// Not changing selection state, draw the word in single mode:
-
- if ( state.GetSelectionState() != wxHTML_SEL_OUT &&
+ if ( selstate != wxHTML_SEL_OUT &&
dc.GetBackgroundMode() != wxSOLID )
{
- SwitchSelState(dc, state, true);
+ SwitchSelState(dc, info, true);
}
- else if ( state.GetSelectionState() == wxHTML_SEL_OUT &&
+ else if ( selstate == wxHTML_SEL_OUT &&
dc.GetBackgroundMode() == wxSOLID )
{
- SwitchSelState(dc, state, false);
+ 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;
}
+wxCursor wxHtmlWordCell::GetCursor() const
+{
+ if ( !GetLink() )
+ {
+ if ( !gs_cursorText )
+ gs_cursorText = new wxCursor(wxCURSOR_IBEAM);
+ return *gs_cursorText;
+ }
+ else
+ return wxHtmlCell::GetCursor();
+}
//-----------------------------------------------------------------------------
}
wxHtmlCell *cell = m_Cells, *line = m_Cells;
+ wxHtmlCell *nextCell;
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 xcnt = 0;
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 = 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:
- 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;
m_LastLayout = w;
}
-void wxHtmlContainerCell::UpdateRenderingStatePre(wxHtmlRenderingState& state,
+void wxHtmlContainerCell::UpdateRenderingStatePre(wxHtmlRenderingInfo& info,
wxHtmlCell *cell) const
{
- wxHtmlSelection *s = state.GetSelection();
+ wxHtmlSelection *s = info.GetSelection();
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
{
- wxHtmlSelection *s = state.GetSelection();
+ wxHtmlSelection *s = info.GetSelection();
if (!s) return;
if (s->GetToCell() == cell)
- state.SetSelectionState(wxHTML_SEL_OUT);
+ info.GetState().SetSelectionState(wxHTML_SEL_OUT);
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,
- wxHtmlRenderingState& state)
+ wxHtmlRenderingInfo& info)
{
+#if 0 // useful for debugging
+ dc.SetPen(*wxRED_PEN);
+ dc.DrawRectangle(x+m_PosX,y+m_PosY,m_Width,m_Height);
+#endif
// container visible, draw it:
if ((y + m_PosY <= view_y2) && (y + m_PosY + m_Height > view_y1))
{
// 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,
- state);
- UpdateRenderingStatePost(state, cell);
+ info);
+ UpdateRenderingStatePost(info, cell);
}
}
}
// 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,
- wxHtmlRenderingState& state)
+ wxHtmlRenderingInfo& info)
{
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);
}
}
}
else if ( flags & wxHTML_FIND_NEAREST_AFTER )
{
wxHtmlCell *c;
- int y2;
for ( const wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext() )
{
- y2 = cell->GetPosY() + cell->GetHeight() - 1;
- if (y2 < y || (y2 == y && cell->GetPosX()+cell->GetWidth()-1 < x))
+ if ( cell->IsFormattingCell() )
+ continue;
+ int cellY = cell->GetPosY();
+ if (!( y < cellY || (y < cellY + cell->GetHeight() &&
+ x < cell->GetPosX() + cell->GetWidth()) ))
continue;
- c = cell->FindCellByPos(x - cell->GetPosX(), y - cell->GetPosY(),
- flags);
+
+ c = cell->FindCellByPos(x - cell->GetPosX(), y - cellY, flags);
if (c) return c;
}
}
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;
- c2 = cell->FindCellByPos(x - cell->GetPosX(), y - cell->GetPosY(),
- flags);
+ c2 = cell->FindCellByPos(x - cell->GetPosX(), y - cellY, flags);
if (c2)
c = c2;
}
-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 )
if ( c )
return c;
+ wxHtmlCell *ctmp;
wxHtmlCell *c2 = NULL;
for (c = m_Cells; c; c = c->GetNext())
- c2 = c->GetLastTerminal();
+ {
+ ctmp = c->GetLastTerminal();
+ if ( ctmp )
+ c2 = ctmp;
+ }
return c2;
}
else
}
+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;
+ }
+ }
+ }
+ }
+ }
+}
+
+
// --------------------------------------------------------------------------
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),
- wxHtmlRenderingState& state)
+ wxHtmlRenderingInfo& info)
{
+ wxHtmlRenderingState& state = info.GetState();
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);
- 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));
+ }
}
}
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),
- wxHtmlRenderingState& WXUNUSED(state))
+ wxHtmlRenderingInfo& WXUNUSED(info))
{
dc.SetFont(m_Font);
}
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;
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;
while ( m_pos->GetFirstChild() != NULL )
m_pos = m_pos->GetFirstChild();
} while ( !m_pos->IsTerminalCell() );
-
+
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
projects / wxWidgets.git / blobdiff