// wxHtmlCell::GetCursor() method simply returns wxNullCursor, so we
// know that GetCursor() was overridden iff it returns valid cursor.
wxCursor cur = GetCursor();
- if (cur.Ok())
+ if (cur.IsOk())
return cur;
#endif // WXWIN_COMPATIBILITY_2_6
}
-bool wxHtmlCell::AdjustPagebreak(int *pagebreak,
- wxArrayInt& WXUNUSED(known_pagebreaks)) const
+bool
+wxHtmlCell::AdjustPagebreak(int *pagebreak,
+ const wxArrayInt& WXUNUSED(known_pagebreaks),
+ int pageHeight) const
{
- if ((!m_CanLiveOnPagebreak) &&
- m_PosY < *pagebreak && m_PosY + m_Height > *pagebreak)
+ // Notice that we always break the cells bigger than the page height here
+ // as otherwise we wouldn't be able to break them at all.
+ if ( m_Height <= pageHeight &&
+ (!m_CanLiveOnPagebreak &&
+ m_PosY < *pagebreak && m_PosY + m_Height > *pagebreak) )
{
*pagebreak = m_PosY;
return true;
this == s->GetToCell() ? s->GetToPos() : wxDefaultPosition,
p1, p2);
- wxPoint p(0, m_Word.length());
-
if ( this == s->GetFromCell() )
- p.x = p1; // selection starts here
+ s->SetFromCharacterPos (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);
+ s->SetToCharacterPos (p2); // selection ends here
}
if ( toSelection )
{
- dc.SetBackgroundMode(wxBRUSHSTYLE_SOLID);
+ dc.SetBackgroundMode(wxSOLID);
dc.SetTextForeground(info.GetStyle().GetSelectedTextColour(fg));
dc.SetTextBackground(info.GetStyle().GetSelectedTextBgColour(bg));
dc.SetBackground(wxBrush(info.GetStyle().GetSelectedTextBgColour(bg),
}
else
{
- dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
+ const int mode = info.GetState().GetBgMode();
+ dc.SetBackgroundMode(mode);
dc.SetTextForeground(fg);
dc.SetTextBackground(bg);
- dc.SetBackground(wxBrush(bg, wxBRUSHSTYLE_SOLID));
+ if ( mode != wxTRANSPARENT )
+ dc.SetBackground(wxBrush(bg, mode));
}
}
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 )
+ if ( !s->AreFromToCharacterPosSet () )
{
SetSelectionPrivPos(dc, s);
- priv = (this == s->GetFromCell()) ?
- s->GetFromPrivPos() : s->GetToPrivPos();
}
- int part1 = priv.x;
- int part2 = priv.y;
+ int part1 = s->GetFromCell()==this ? s->GetFromCharacterPos() : 0;
+ int part2 = s->GetToCell()==this ? s->GetToCharacterPos() : m_Word.Length();
if ( part1 > 0 )
{
{
wxHtmlSelectionState selstate = info.GetState().GetSelectionState();
// Not changing selection state, draw the word in single mode:
- if ( selstate != wxHTML_SEL_OUT &&
- dc.GetBackgroundMode() != wxBRUSHSTYLE_SOLID )
- {
- SwitchSelState(dc, info, true);
- }
- else if ( selstate == wxHTML_SEL_OUT &&
- dc.GetBackgroundMode() == wxBRUSHSTYLE_SOLID )
- {
- SwitchSelState(dc, info, false);
- }
+ SwitchSelState(dc, info, selstate != wxHTML_SEL_OUT);
dc.DrawText(m_Word, x + m_PosX, y + m_PosY);
drawSelectionAfterCell = (selstate != wxHTML_SEL_OUT);
}
{
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
// entire contents of the cell in this case
//
// TODO: but this really needs to be fixed in some better way later...
- if ( priv != wxDefaultPosition )
+ if ( s->AreFromToCharacterPosSet() )
{
- const int part1 = priv.x;
- const int part2 = priv.y;
+ const int part1 = s->GetFromCell()==this ? s->GetFromCharacterPos() : 0;
+ const int part2 = s->GetToCell()==this ? s->GetToCharacterPos() : m_Word.Length();
if ( part1 == part2 )
return wxEmptyString;
return GetPartAsText(part1, part2);
}
-bool wxHtmlContainerCell::AdjustPagebreak(int *pagebreak,
- wxArrayInt& known_pagebreaks) const
+bool
+wxHtmlContainerCell::AdjustPagebreak(int *pagebreak,
+ const wxArrayInt& known_pagebreaks,
+ int pageHeight) const
{
if (!m_CanLiveOnPagebreak)
- return wxHtmlCell::AdjustPagebreak(pagebreak, known_pagebreaks);
+ return wxHtmlCell::AdjustPagebreak(pagebreak, known_pagebreaks, pageHeight);
wxHtmlCell *c = GetFirstChild();
bool rt = false;
while (c)
{
- if (c->AdjustPagebreak(&pbrk, known_pagebreaks))
+ if (c->AdjustPagebreak(&pbrk, known_pagebreaks, pageHeight))
rt = true;
c = c->GetNext();
}
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, wxBRUSHSTYLE_SOLID));
- }
- else
- {
- wxColour c = info.GetStyle().GetSelectedTextBgColour(m_Colour);
- dc.SetTextBackground(c);
- dc.SetBackground(wxBrush(c, wxBRUSHSTYLE_SOLID));
- }
+ state.SetBgMode(wxSOLID);
+ const wxColour c = state.GetSelectionState() == wxHTML_SEL_IN
+ ? info.GetStyle().GetSelectedTextBgColour(m_Colour)
+ : m_Colour;
+ dc.SetTextBackground(c);
+ dc.SetBackground(c);
+ dc.SetBackgroundMode(wxSOLID);
+ }
+ if (m_Flags & wxHTML_CLR_TRANSPARENT_BACKGROUND)
+ {
+ state.SetBgColour(m_Colour);
+ state.SetBgMode(wxTRANSPARENT);
+ const wxColour c = state.GetSelectionState() == wxHTML_SEL_IN
+ ? info.GetStyle().GetSelectedTextBgColour(m_Colour)
+ : m_Colour;
+ dc.SetTextBackground(c);
+ dc.SetBackgroundMode(wxTRANSPARENT);
}
}
projects / wxWidgets.git / blobdiff