const wxPoint& pos,
const wxMouseEvent& event)
{
- wxCHECK_MSG( window, false, _T("window interface must be provided") );
+ wxCHECK_MSG( window, false, wxT("window interface must be provided") );
#if WXWIN_COMPATIBILITY_2_6
// NB: this hack puts the body of ProcessMouseClick() into OnMouseClick()
void wxHtmlCell::OnMouseClick(wxWindow *, int, int, const wxMouseEvent& event)
{
- wxCHECK_RET( gs_helperOnMouseClick, _T("unexpected call to OnMouseClick") );
+ wxCHECK_RET( gs_helperOnMouseClick, wxT("unexpected call to OnMouseClick") );
wxHtmlWindowInterface *window = gs_helperOnMouseClick->window;
const wxPoint& pos = gs_helperOnMouseClick->pos;
#endif // WXWIN_COMPATIBILITY_2_6
#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
+ // overridden 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.
+ // 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;
void wxHtmlCell::SetLink(const wxHtmlLinkInfo& link)
{
- if (m_Link) delete m_Link;
- m_Link = NULL;
+ wxDELETE(m_Link);
if (link.GetHref() != wxEmptyString)
m_Link = new wxHtmlLinkInfo(link);
}
}
}
- wxFAIL_MSG(_T("Cells are in different trees"));
+ wxFAIL_MSG(wxT("Cells are in different trees"));
return false;
}
pt2.x = m_Width;
// before selection:
+ // (include character under caret only if in first half of width)
#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__
+ if ( i < len )
+ {
+ int charW = (i > 0) ? widths[i] - widths[i-1] : widths[i];
+ if ( widths[i] - pt1.x < charW/2 )
+ i++;
+ }
+#else // !__WXMAC__
wxCoord charW, charH;
while ( pt1.x > 0 && i < len )
{
dc.GetTextExtent(m_Word[i], &charW, &charH);
pt1.x -= charW;
- if ( pt1.x >= 0 )
+ if ( pt1.x >= -charW/2 )
{
pos1 += charW;
i++;
#endif // __WXMAC__/!__WXMAC__
// in selection:
+ // (include character under caret only if in first half of width)
unsigned j = i;
#ifdef __WXMAC__
while( j < len && pt2.x >= widths[j] )
j++ ;
-#else // __WXMAC__
+ if ( j < len )
+ {
+ int charW = (j > 0) ? widths[j] - widths[j-1] : widths[j];
+ if ( widths[j] - pt2.x < charW/2 )
+ j++;
+ }
+#else // !__WXMAC__
pos2 = pos1;
pt2.x -= pos2;
while ( pt2.x > 0 && j < len )
{
dc.GetTextExtent(m_Word[j], &charW, &charH);
pt2.x -= charW;
- if ( pt2.x >= 0 )
+ if ( pt2.x >= -charW/2 )
{
pos2 += charW;
j++;
pos1 = i;
pos2 = j;
+
+ wxASSERT( pos2 >= pos1 );
}
void wxHtmlWordCell::SetSelectionPrivPos(const wxDC& dc, wxHtmlSelection *s) const
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);
+ s->SetFromCharacterPos (p1); // selection starts here
if ( this == s->GetToCell() )
- s->SetToPrivPos(p);
+ s->SetToCharacterPos (p2); // selection ends here
}
if ( toSelection )
{
- dc.SetBackgroundMode(wxSOLID);
+ dc.SetBackgroundMode(wxBRUSHSTYLE_SOLID);
dc.SetTextForeground(info.GetStyle().GetSelectedTextColour(fg));
dc.SetTextBackground(info.GetStyle().GetSelectedTextBgColour(bg));
dc.SetBackground(wxBrush(info.GetStyle().GetSelectedTextBgColour(bg),
- wxSOLID));
+ wxBRUSHSTYLE_SOLID));
}
else
{
- dc.SetBackgroundMode(wxTRANSPARENT);
+ dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
dc.SetTextForeground(fg);
dc.SetTextBackground(bg);
- dc.SetBackground(wxBrush(bg, wxSOLID));
+ dc.SetBackground(wxBrush(bg, wxBRUSHSTYLE_SOLID));
}
}
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() != wxSOLID )
+ dc.GetBackgroundMode() != wxBRUSHSTYLE_SOLID )
{
SwitchSelState(dc, info, true);
}
else if ( selstate == wxHTML_SEL_OUT &&
- dc.GetBackgroundMode() == wxSOLID )
+ dc.GetBackgroundMode() == wxBRUSHSTYLE_SOLID )
{
SwitchSelState(dc, info, false);
}
}
}
+wxCursor wxHtmlWordCell::GetMouseCursor(wxHtmlWindowInterface *window) const
+{
+ if ( !GetLink() )
+ {
+ return window->GetHTMLCursor(wxHtmlWindowInterface::HTMLCursor_Text);
+ }
+ else
+ {
+ return wxHtmlCell::GetMouseCursor(window);
+ }
+}
wxString wxHtmlWordCell::ConvertToText(wxHtmlSelection *s) const
{
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() )
{
- int part1 = priv.x;
- int part2 = priv.y;
- return m_Word.Mid(part1, part2-part1);
+ 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);
}
//else: return the whole word below
}
- return m_Word;
+ return GetAllAsText();
}
-wxCursor wxHtmlWordCell::GetMouseCursor(wxHtmlWindowInterface *window) const
+wxString wxHtmlWordWithTabsCell::GetAllAsText() const
{
- if ( !GetLink() )
+ return m_wordOrig;
+}
+
+wxString wxHtmlWordWithTabsCell::GetPartAsText(int begin, int end) const
+{
+ // NB: The 'begin' and 'end' positions are in the _displayed_ text
+ // (stored in m_Word) and not in the text with tabs that should
+ // be copied to clipboard (m_wordOrig).
+ //
+ // NB: Because selection is performed on displayed text, it's possible
+ // to select e.g. "half of TAB character" -- IOW, 'begin' and 'end'
+ // may be in the middle of TAB character expansion into ' 's. In this
+ // case, we copy the TAB character to clipboard once.
+
+ wxASSERT( begin < end );
+
+ const unsigned SPACES_PER_TAB = 8;
+
+ wxString sel;
+
+ int pos = 0;
+ wxString::const_iterator i = m_wordOrig.begin();
+
+ // find the beginning of text to copy:
+ for ( ; pos < begin; ++i )
{
- return window->GetHTMLCursor(wxHtmlWindowInterface::HTMLCursor_Text);
+ if ( *i == '\t' )
+ {
+ pos += 8 - (m_linepos + pos) % SPACES_PER_TAB;
+ if ( pos >= begin )
+ {
+ sel += '\t';
+ }
+ }
+ else
+ {
+ ++pos;
+ }
}
- else
+
+ // copy the content until we reach 'end':
+ for ( ; pos < end; ++i )
{
- return wxHtmlCell::GetMouseCursor(window);
+ const wxChar c = *i;
+ sel += c;
+
+ if ( c == '\t' )
+ pos += 8 - (m_linepos + pos) % SPACES_PER_TAB;
+ else
+ ++pos;
}
+
+ return sel;
}
+
//-----------------------------------------------------------------------------
// wxHtmlContainerCell
//-----------------------------------------------------------------------------
m_IndentLeft = m_IndentRight = m_IndentTop = m_IndentBottom = 0;
m_WidthFloat = 100; m_WidthFloatUnits = wxHTML_UNITS_PERCENT;
m_UseBkColour = false;
- m_UseBorder = false;
+ m_Border = 0;
m_MinHeight = 0;
m_MinHeightAlign = wxHTML_ALIGN_TOP;
m_LastLayout = -1;
}
-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();
}
{
wxHtmlCell::Layout(w);
- if (m_LastLayout == w) return;
+ if (m_LastLayout == w)
+ return;
+ m_LastLayout = w;
// VS: Any attempt to layout with negative or zero width leads to hell,
// but we can't ignore such attempts completely, since it sometimes
/*
- LAYOUTING :
+ LAYOUT :
*/
s_indent = (m_IndentLeft < 0) ? (-m_IndentLeft * m_Width / 100) : m_IndentLeft;
s_width = m_Width - s_indent - ((m_IndentRight < 0) ? (-m_IndentRight * m_Width / 100) : m_IndentRight);
- // my own layouting:
+ // my own layout:
wxHtmlCell *cell = m_Cells,
*line = m_Cells;
while (cell != NULL)
m_MaxTotalWidth += s_indent + ((m_IndentRight < 0) ? (-m_IndentRight * m_Width / 100) : m_IndentRight);
MaxLineWidth += s_indent + ((m_IndentRight < 0) ? (-m_IndentRight * m_Width / 100) : m_IndentRight);
if (m_Width < MaxLineWidth) m_Width = MaxLineWidth;
-
- m_LastLayout = w;
}
void wxHtmlContainerCell::UpdateRenderingStatePre(wxHtmlRenderingInfo& info,
if (m_UseBkColour)
{
- wxBrush myb = wxBrush(m_BkColour, wxSOLID);
+ wxBrush myb = wxBrush(m_BkColour, wxBRUSHSTYLE_SOLID);
int real_y1 = mMax(ylocal, view_y1);
int real_y2 = mMin(ylocal + m_Height - 1, view_y2);
dc.DrawRectangle(xlocal, real_y1, m_Width, real_y2 - real_y1 + 1);
}
- if (m_UseBorder)
+ if (m_Border == 1)
{
- wxPen mypen1(m_BorderColour1, 1, wxSOLID);
- wxPen mypen2(m_BorderColour2, 1, wxSOLID);
+ // draw thin border using lines
+ wxPen mypen1(m_BorderColour1, 1, wxPENSTYLE_SOLID);
+ wxPen mypen2(m_BorderColour2, 1, wxPENSTYLE_SOLID);
dc.SetPen(mypen1);
dc.DrawLine(xlocal, ylocal, xlocal, ylocal + m_Height - 1);
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);
}
-
+ else if (m_Border> 0)
+ {
+ wxBrush mybrush1(m_BorderColour1, wxBRUSHSTYLE_SOLID);
+ wxBrush mybrush2(m_BorderColour2, wxBRUSHSTYLE_SOLID);
+
+ // draw upper left corner
+ // 0---------------5
+ // | /
+ // | 3-----------4
+ // | |
+ // | 2
+ // |/
+ // 1
+
+ wxPoint poly[6];
+ poly[0].x =m_PosX; poly[0].y = m_PosY ;
+ poly[1].x =m_PosX; poly[1].y = m_PosY + m_Height;
+ poly[2].x =m_PosX + m_Border; poly[2].y = poly[1].y - m_Border;
+ poly[3].x =poly[2].x ; poly[3].y = m_PosY + m_Border;
+ poly[4].x =m_PosX + m_Width - m_Border; poly[4].y = poly[3].y;
+ poly[5].x =m_PosX + m_Width; poly[5].y = m_PosY;
+
+ dc.SetBrush(mybrush1);
+ dc.SetPen(*wxTRANSPARENT_PEN);
+ dc.DrawPolygon(6, poly, x, y);
+
+ // draw lower right corner reusing point 1,2,4 and 5
+ // 5
+ // /|
+ // 4 |
+ // | |
+ // 2-----------3 |
+ // / |
+ // 1---------------0
+ dc.SetBrush(mybrush2);
+ poly[0].x = poly[5].x; poly[0].y = poly[1].y;
+ poly[3].x = poly[4].x; poly[3].y = poly[2].y;
+ dc.DrawPolygon(6, poly, x, y);
+
+ // smooth color transition like firefox
+ wxColour borderMediumColour(
+ (m_BorderColour1.Red() + m_BorderColour2.Red()) /2 ,
+ (m_BorderColour1.Green() + m_BorderColour2.Green()) /2 ,
+ (m_BorderColour1.Blue() + m_BorderColour2.Blue()) /2
+ );
+ wxPen mypen3(borderMediumColour, 1, wxPENSTYLE_SOLID);
+ dc.SetPen(mypen3);
+ dc.DrawLines(2, &poly[1], x, y - 1); // between 1 and 2
+ dc.DrawLines(2, &poly[4], x, y - 1); // between 4 and 5
+ }
if (m_Cells)
{
// draw container's contents:
void wxHtmlContainerCell::OnMouseClick(wxWindow*,
int, int, const wxMouseEvent& event)
{
- wxCHECK_RET( gs_helperOnMouseClick, _T("unexpected call to OnMouseClick") );
+ wxCHECK_RET( gs_helperOnMouseClick, wxT("unexpected call to OnMouseClick") );
wxHtmlWindowInterface *window = gs_helperOnMouseClick->window;
const wxPoint& pos = gs_helperOnMouseClick->pos;
#endif // WXWIN_COMPATIBILITY_2_6
if (state.GetSelectionState() != wxHTML_SEL_IN)
{
dc.SetTextBackground(m_Colour);
- dc.SetBackground(wxBrush(m_Colour, wxSOLID));
+ dc.SetBackground(wxBrush(m_Colour, wxBRUSHSTYLE_SOLID));
}
else
{
wxColour c = info.GetStyle().GetSelectedTextBgColour(m_Colour);
dc.SetTextBackground(c);
- dc.SetBackground(wxBrush(c, wxSOLID));
+ dc.SetBackground(wxBrush(c, wxBRUSHSTYLE_SOLID));
}
}
}
wxScrolledWindow *scrolwin =
wxDynamicCast(m_Wnd->GetParent(), wxScrolledWindow);
wxCHECK_RET( scrolwin,
- _T("widget cells can only be placed in wxHtmlWindow") );
+ wxT("widget cells can only be placed in wxHtmlWindow") );
scrolwin->GetViewStart(&stx, &sty);
m_Wnd->SetSize(absx - wxHTML_SCROLL_STEP * stx,
projects / wxWidgets.git / blobdiff