#endif
#ifndef WXPRECOMP
-#include "wx/wx.h"
+ #include "wx/brush.h"
+ #include "wx/colour.h"
+ #include "wx/dc.h"
#endif
#include "wx/html/htmlcell.h"
// wxHtmlCell
//-----------------------------------------------------------------------------
-wxHtmlCell::wxHtmlCell() : wxObject()
+wxHtmlCell::wxHtmlCell() : wxObject()
{
- m_Next = NULL;
- m_Parent = NULL;
- m_Width = m_Height = m_Descent = 0;
+ m_Next = NULL;
+ m_Parent = NULL;
+ m_Width = m_Height = m_Descent = 0;
m_CanLiveOnPagebreak = TRUE;
m_Link = NULL;
}
-wxHtmlCell::~wxHtmlCell()
+wxHtmlCell::~wxHtmlCell()
{
- if (m_Link) delete m_Link;
- if (m_Next) delete m_Next;
+ delete m_Link;
}
-void wxHtmlCell::OnMouseClick(wxWindow *parent, int x, int y,
+void wxHtmlCell::OnMouseClick(wxWindow *parent, int x, int y,
const wxMouseEvent& event)
{
wxHtmlLinkInfo *lnk = GetLink(x, y);
wxHtmlLinkInfo lnk2(*lnk);
lnk2.SetEvent(&event);
lnk2.SetHtmlCell(this);
- ((wxHtmlWindow*)parent)->OnLinkClicked(lnk2);
- // note : this overcasting is legal because parent is *always* wxHtmlWindow
+
+ // note : this cast is legal because parent is *always* wxHtmlWindow
+ wxStaticCast(parent, wxHtmlWindow)->OnLinkClicked(lnk2);
}
}
bool wxHtmlCell::AdjustPagebreak(int *pagebreak) const
{
- if ((!m_CanLiveOnPagebreak) &&
- m_PosY < *pagebreak && m_PosY + m_Height > *pagebreak)
- {
+ if ((!m_CanLiveOnPagebreak) &&
+ m_PosY < *pagebreak && m_PosY + m_Height > *pagebreak)
+ {
*pagebreak = m_PosY;
- if (m_Next != NULL) m_Next->AdjustPagebreak(pagebreak);
return TRUE;
}
-
- else
- {
- if (m_Next != NULL) return m_Next->AdjustPagebreak(pagebreak);
- else return FALSE;
- }
+
+ return FALSE;
}
-void wxHtmlCell::SetLink(const wxHtmlLinkInfo& link)
+void wxHtmlCell::SetLink(const wxHtmlLinkInfo& link)
{
if (m_Link) delete m_Link;
m_Link = NULL;
-void wxHtmlCell::Layout(int w)
+void wxHtmlCell::Layout(int WXUNUSED(w))
{
- SetPos(0, 0);
- if (m_Next) m_Next->Layout(w);
+ SetPos(0, 0);
}
-void wxHtmlCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
+
+void wxHtmlCell::GetHorizontalConstraints(int *left, int *right) const
{
- if (m_Next) m_Next->Draw(dc, x, y, view_y1, view_y2);
+ if (left)
+ *left = m_PosX;
+ if (right)
+ *right = m_PosX + m_Width;
}
-void wxHtmlCell::DrawInvisible(wxDC& dc, int x, int y)
+const wxHtmlCell* wxHtmlCell::Find(int WXUNUSED(condition), const void* WXUNUSED(param)) const
{
- if (m_Next) m_Next->DrawInvisible(dc, x, y);
+ return NULL;
}
-
-const wxHtmlCell* wxHtmlCell::Find(int condition, const void* param) const
+wxHtmlCell *wxHtmlCell::FindCellByPos(wxCoord x, wxCoord y) const
{
- if (m_Next) return m_Next->Find(condition, param);
- else return NULL;
-}
+ if ( x >= 0 && x < m_Width && y >= 0 && y < m_Height )
+ return wxConstCast(this, wxHtmlCell);
+ return NULL;
+}
//-----------------------------------------------------------------------------
wxHtmlWordCell::wxHtmlWordCell(const wxString& word, wxDC& dc) : wxHtmlCell()
{
m_Word = word;
-
- if (m_Word.Find(wxT('&')) != -1)
- {
-#define ESCSEQ(escape, subst) \
- { _T("&") _T(escape) _T(";"), _T("&") _T(escape) _T(" "), _T("&") _T(escape), _T(subst) }
- static wxChar* substitutions[][4] =
- {
- ESCSEQ("quot", "\""),
- ESCSEQ("#34", "\""),
- ESCSEQ("#8220", "\""),
- ESCSEQ("#8221", "\""),
- ESCSEQ("lt", "<"),
- ESCSEQ("#60", "<"),
- ESCSEQ("gt", ">"),
- ESCSEQ("#62", ">"),
-
- ESCSEQ("#94", "^"), /* ^ */
-
- ESCSEQ("nbsp", " "),
- ESCSEQ("#32", " "),
- ESCSEQ("iexcl", "!"),
- ESCSEQ("#33", "!"),
- ESCSEQ("cent", "¢"/* ¢ */),
- ESCSEQ("#162", "¢"/* ¢ */),
-
- ESCSEQ("trade", "(TM)"),
- ESCSEQ("#153", "(TM)"),
- ESCSEQ("#8482", "(TM)"),
-
- ESCSEQ("yen", "¥"),
- ESCSEQ("#165", "¥"),
- ESCSEQ("brkbar", "¦"),
- ESCSEQ("#166", "¦"),
- ESCSEQ("sect", "§"),
- ESCSEQ("#167", "§"),
- ESCSEQ("uml", "¨"),
- ESCSEQ("#168", "¨"),
-
- ESCSEQ("copy", "©"), /* © */
- ESCSEQ("#169", "©"),
- ESCSEQ("ordf", "ª"),
- ESCSEQ("#170", "ª"),
- ESCSEQ("laquo", "«"), /* « */
- ESCSEQ("#171", "«"),
- ESCSEQ("not", "¬"),
- ESCSEQ("#172", "¬"),
-
- ESCSEQ("reg", "®"), /* ® */
- ESCSEQ("#174", "®"),
-
- ESCSEQ("deg", "°"), /* ° */
- ESCSEQ("#176", "°"),
- ESCSEQ("plusm", "±"), /* ± */
- ESCSEQ("#177", "±"),
-
- ESCSEQ("acute", "´"),
- ESCSEQ("#180", "´"),
- ESCSEQ("macron", "¯"),
- ESCSEQ("#175", "¯"),
- ESCSEQ("micro", "µ"), /* µ */
- ESCSEQ("#181", "µ"),
- ESCSEQ("para", "¶"), /* ¶ */
- ESCSEQ("#182", "¶"),
-
- ESCSEQ("ordm", "º"), /* º */
- ESCSEQ("#186", "º"),
- ESCSEQ("raquo", "»"), /* » */
- ESCSEQ("#187", "»"),
-
- ESCSEQ("iquest", "¿"), /* ¿ */
- ESCSEQ("#191", "¿"),
- ESCSEQ("Agrave", "\300"/* À */),
- ESCSEQ("#193", "\300"/* À */),
-
- ESCSEQ("Acirc", "\302"/* Â */),
- ESCSEQ("Atilde", "\303"/* Ã */),
- ESCSEQ("Auml", "\304"/* Ä */),
- ESCSEQ("Aring", " "),
- ESCSEQ("AElig", " "),
- ESCSEQ("Ccedil", "\347"/* ç */),
- ESCSEQ("Egrave", "\310"/* È */),
- ESCSEQ("Eacute", "\311"/* É */),
- ESCSEQ("Ecirc", "\312"/* Ê */),
- ESCSEQ("Euml", "\313"/* Ë */),
- ESCSEQ("Igrave", "\314"/* Ì */),
-
- ESCSEQ("Icirc", "\316"/* Î */),
- ESCSEQ("Iuml", "\317"/* Ï */),
-
- ESCSEQ("Ntilde", "\321"/* Ñ */),
- ESCSEQ("Ograve", "\322"/* Ò */),
-
- ESCSEQ("Ocirc", "\324"/* Ô */),
- ESCSEQ("Otilde", "\325"/* Õ */),
- ESCSEQ("Ouml", "\326"/* Ö */),
-
- ESCSEQ("Oslash", " "),
- ESCSEQ("Ugrave", "\331"/* Ù */),
-
- ESCSEQ("Ucirc", " "),
- ESCSEQ("Uuml", "\334"/* Ü */),
-
- ESCSEQ("szlig", "\247"/* § */),
- ESCSEQ("agrave","à"),
- ESCSEQ("aacute", "\341"/* á */),
- ESCSEQ("acirc", "\342"/* â */),
- ESCSEQ("atilde", "\343"/* ã */),
- ESCSEQ("auml", "\344"/* ä */),
- ESCSEQ("aring", "a"),
- ESCSEQ("aelig", "ae"),
- ESCSEQ("ccedil", "\347"/* ç */),
- ESCSEQ("egrave", "\350"/* è */),
- ESCSEQ("eacute", "\351"/* é */),
- ESCSEQ("ecirc", "\352"/* ê */),
- ESCSEQ("euml", "\353"/* ë */),
- ESCSEQ("igrave", "\354"/* ì */),
- ESCSEQ("iacute", "\355"/* í */),
- ESCSEQ("icirc", " "),
- ESCSEQ("iuml", "\357"/* ï */),
- ESCSEQ("eth", " "),
- ESCSEQ("ntilde", "\361"/* ñ */),
- ESCSEQ("ograve", "\362"/* ò */),
- ESCSEQ("oacute", "\363"/* ó */),
- ESCSEQ("ocirc", "\364"/* ô */),
- ESCSEQ("otilde", "\365"/* õ */),
- ESCSEQ("ouml", "\366"/* ö */),
- ESCSEQ("divide", " "),
- ESCSEQ("oslash", " "),
- ESCSEQ("ugrave", "\371"/* ù */),
- ESCSEQ("uacute", "\372"/* ú */),
- ESCSEQ("ucirc", "\373"/* û */),
- ESCSEQ("uuml", "\374"/* ü */),
-
- ESCSEQ("yuml", ""),
-
- /* this one should ALWAYS stay the last one!!! */
- ESCSEQ("amp", "&"),
- ESCSEQ("#38", "&"),
-
- { NULL, NULL, NULL }
- };
-
- for (int i = 0; substitutions[i][0] != NULL; i++)
- {
- m_Word.Replace(substitutions[i][0], substitutions[i][3], TRUE);
- m_Word.Replace(substitutions[i][1], substitutions[i][3], TRUE);
- m_Word.Replace(substitutions[i][2], substitutions[i][3], TRUE);
- }
- }
-
dc.GetTextExtent(m_Word, &m_Width, &m_Height, &m_Descent);
SetCanLiveOnPagebreak(FALSE);
}
-void wxHtmlWordCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
+void wxHtmlWordCell::Draw(wxDC& dc, int x, int y, int WXUNUSED(view_y1), int WXUNUSED(view_y2))
{
dc.DrawText(m_Word, x + m_PosX, y + m_PosY);
- wxHtmlCell::Draw(dc, x, y, view_y1, view_y2);
}
m_LastLayout = -1;
}
-wxHtmlContainerCell::~wxHtmlContainerCell()
+wxHtmlContainerCell::~wxHtmlContainerCell()
{
- if (m_Cells) delete m_Cells;
+ wxHtmlCell *cell = m_Cells;
+ while ( cell )
+ {
+ wxHtmlCell *cellNext = cell->GetNext();
+ delete cell;
+ cell = cellNext;
+ }
}
bool wxHtmlContainerCell::AdjustPagebreak(int *pagebreak) const
{
- if (!m_CanLiveOnPagebreak)
+ if (!m_CanLiveOnPagebreak)
return wxHtmlCell::AdjustPagebreak(pagebreak);
- else
+ else
{
wxHtmlCell *c = GetFirstCell();
bool rt = FALSE;
int pbrk = *pagebreak - m_PosY;
- while (c)
- {
- if (c->AdjustPagebreak(&pbrk)) rt = TRUE;
+ while (c)
+ {
+ if (c->AdjustPagebreak(&pbrk))
+ rt = TRUE;
c = c->GetNext();
}
- if (rt) *pagebreak = pbrk + m_PosY;
+ if (rt)
+ *pagebreak = pbrk + m_PosY;
return rt;
}
}
void wxHtmlContainerCell::Layout(int w)
{
- if (m_LastLayout == w)
+ wxHtmlCell::Layout(w);
+
+ if (m_LastLayout == w) return;
+
+ // VS: Any attempt to layout with negative or zero width leads to hell,
+ // but we can't ignore such attempts completely, since it sometimes
+ // happen (e.g. when trying how small a table can be). The best thing we
+ // can do is to set the width of child cells to zero
+ if (w < 1)
{
- wxHtmlCell::Layout(w);
- return;
- }
+ m_Width = 0;
+ for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext())
+ cell->Layout(0);
+ // this does two things: it recursively calls this code on all child
+ // contrainers and resets children's position to (0,0)
+ return;
+ }
wxHtmlCell *cell = m_Cells, *line = m_Cells;
long xpos = 0, ypos = m_IndentTop;
*/
- if (m_WidthFloatUnits == wxHTML_UNITS_PERCENT)
+ if (m_WidthFloatUnits == wxHTML_UNITS_PERCENT)
{
if (m_WidthFloat < 0) m_Width = (100 + m_WidthFloat) * w / 100;
else m_Width = m_WidthFloat * w / 100;
}
- else
+ else
{
if (m_WidthFloat < 0) m_Width = w + m_WidthFloat;
else m_Width = m_WidthFloat;
}
- if (m_Cells)
+ if (m_Cells)
{
int l = (m_IndentLeft < 0) ? (-m_IndentLeft * m_Width / 100) : m_IndentLeft;
int r = (m_IndentRight < 0) ? (-m_IndentRight * m_Width / 100) : m_IndentRight;
- m_Cells->Layout(m_Width - (l + r));
+ for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext())
+ cell->Layout(m_Width - (l + r));
}
/*
s_width = m_Width - s_indent - ((m_IndentRight < 0) ? (-m_IndentRight * m_Width / 100) : m_IndentRight);
// my own layouting:
- while (cell != NULL)
+ while (cell != NULL)
{
- switch (m_AlignVer)
- {
+ switch (m_AlignVer)
+ {
case wxHTML_ALIGN_TOP : ybasicpos = 0; break;
case wxHTML_ALIGN_BOTTOM : ybasicpos = - cell->GetHeight(); break;
case wxHTML_ALIGN_CENTER : ybasicpos = - cell->GetHeight() / 2; break;
xcnt++;
// force new line if occured:
- if ((cell == NULL) || (xpos + cell->GetWidth() > s_width))
- {
+ if ((cell == NULL) || (xpos + cell->GetWidth() > s_width))
+ {
if (xpos > MaxLineWidth) MaxLineWidth = xpos;
if (ysizeup < 0) ysizeup = 0;
if (ysizedown < 0) ysizedown = 0;
switch (m_AlignHor) {
- case wxHTML_ALIGN_LEFT :
- case wxHTML_ALIGN_JUSTIFY :
- xdelta = 0;
+ case wxHTML_ALIGN_LEFT :
+ case wxHTML_ALIGN_JUSTIFY :
+ xdelta = 0;
break;
- case wxHTML_ALIGN_RIGHT :
- xdelta = 0 + (s_width - xpos);
+ case wxHTML_ALIGN_RIGHT :
+ xdelta = 0 + (s_width - xpos);
break;
- case wxHTML_ALIGN_CENTER :
- xdelta = 0 + (s_width - xpos) / 2;
+ case wxHTML_ALIGN_CENTER :
+ xdelta = 0 + (s_width - xpos) / 2;
break;
}
if (xdelta < 0) xdelta = 0;
xdelta += s_indent;
ypos += ysizeup;
-
+
if (m_AlignHor != wxHTML_ALIGN_JUSTIFY || cell == NULL)
- while (line != cell)
- {
- line->SetPos(line->GetPosX() + xdelta,
+ while (line != cell)
+ {
+ line->SetPos(line->GetPosX() + xdelta,
ypos + line->GetPosY());
line = line->GetNext();
}
else
- {
+ {
int counter = 0;
int step = (s_width - xpos);
if (step < 0) step = 0;
xcnt--;
- if (xcnt > 0) while (line != cell)
- {
+ if (xcnt > 0) while (line != cell)
+ {
line->SetPos(line->GetPosX() + s_indent +
(counter++ * step / xcnt),
ypos + line->GetPosY());
// setup height & width, depending on container layout:
m_Height = ypos + (ysizedown + ysizeup) + m_IndentBottom;
- if (m_Height < m_MinHeight)
+ if (m_Height < m_MinHeight)
{
- if (m_MinHeightAlign != wxHTML_ALIGN_TOP)
- {
+ if (m_MinHeightAlign != wxHTML_ALIGN_TOP)
+ {
int diff = m_MinHeight - m_Height;
if (m_MinHeightAlign == wxHTML_ALIGN_CENTER) diff /= 2;
cell = m_Cells;
- while (cell)
- {
+ while (cell)
+ {
cell->SetPos(cell->GetPosX(), cell->GetPosY() + diff);
cell = cell->GetNext();
}
if (m_Width < MaxLineWidth) m_Width = MaxLineWidth;
m_LastLayout = w;
-
- wxHtmlCell::Layout(w);
}
void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
{
// container visible, draw it:
- if ((y + m_PosY < view_y2) && (y + m_PosY + m_Height > view_y1))
+ if ((y + m_PosY < view_y2) && (y + m_PosY + m_Height > view_y1))
{
- if (m_UseBkColour)
- {
+ if (m_UseBkColour)
+ {
wxBrush myb = wxBrush(m_BkColour, wxSOLID);
int real_y1 = mMax(y + m_PosY, view_y1);
dc.DrawRectangle(x + m_PosX, real_y1, m_Width, real_y2 - real_y1 + 1);
}
- if (m_UseBorder)
- {
+ if (m_UseBorder)
+ {
wxPen mypen1(m_BorderColour1, 1, wxSOLID);
wxPen mypen2(m_BorderColour2, 1, wxSOLID);
dc.DrawLine(x + m_PosX, y + m_PosY + m_Height - 1, x + m_PosX + m_Width - 1, y + m_PosY + m_Height - 1);
}
- if (m_Cells) m_Cells->Draw(dc, x + m_PosX, y + m_PosY, view_y1, view_y2);
+ if (m_Cells)
+ {
+ for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext())
+ cell->Draw(dc, x + m_PosX, y + m_PosY, view_y1, view_y2);
+ }
}
// container invisible, just proceed font+color changing:
- else
+ else
{
- if (m_Cells) m_Cells->DrawInvisible(dc, x + m_PosX, y + m_PosY);
+ if (m_Cells)
+ {
+ for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext())
+ cell->DrawInvisible(dc, x + m_PosX, y + m_PosY);
+ }
}
-
- wxHtmlCell::Draw(dc, x, y, view_y1, view_y2);
}
void wxHtmlContainerCell::DrawInvisible(wxDC& dc, int x, int y)
{
- if (m_Cells) m_Cells->DrawInvisible(dc, x + m_PosX, y + m_PosY);
- wxHtmlCell::DrawInvisible(dc, x, y);
+ if (m_Cells)
+ {
+ for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext())
+ cell->DrawInvisible(dc, x + m_PosX, y + m_PosY);
+ }
}
wxHtmlLinkInfo *wxHtmlContainerCell::GetLink(int x, int y) const
{
- wxHtmlCell *c = m_Cells;
- int cx, cy, cw, ch;
+ wxHtmlCell *cell = FindCellByPos(x, y);
- while (c)
- {
- cx = c->GetPosX(), cy = c->GetPosY();
- cw = c->GetWidth(), ch = c->GetHeight();
- if ((x >= cx) && (x < cx + cw) && (y >= cy) && (y < cy + ch))
- return c->GetLink(x - cx, y - cy);
- c = c->GetNext();
- }
- return NULL;
+ // VZ: I don't know if we should pass absolute or relative coords to
+ // wxHtmlCell::GetLink()? As the base class version just ignores them
+ // anyhow, it hardly matters right now but should still be clarified
+ return cell ? cell->GetLink(x, y) : NULL;
}
void wxHtmlContainerCell::InsertCell(wxHtmlCell *f)
{
if (!m_Cells) m_Cells = m_LastCell = f;
- else
+ else
{
m_LastCell->SetNext(f);
m_LastCell = f;
void wxHtmlContainerCell::SetAlign(const wxHtmlTag& tag)
{
- if (tag.HasParam(wxT("ALIGN")))
+ if (tag.HasParam(wxT("ALIGN")))
{
wxString alg = tag.GetParam(wxT("ALIGN"));
alg.MakeUpper();
void wxHtmlContainerCell::SetWidthFloat(const wxHtmlTag& tag, double pixel_scale)
{
- if (tag.HasParam(wxT("WIDTH")))
+ if (tag.HasParam(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);
}
- else
- {
+ else
+ {
wxSscanf(wd.c_str(), wxT("%i"), &wdi);
SetWidthFloat((int)(pixel_scale * (double)wdi), wxHTML_UNITS_PIXELS);
}
const wxHtmlCell* wxHtmlContainerCell::Find(int condition, const void* param) const
{
- const wxHtmlCell *r = NULL;
+ if (m_Cells)
+ {
+ const wxHtmlCell *r = NULL;
- if (m_Cells)
+ for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext())
+ {
+ r = cell->Find(condition, param);
+ if (r) return r;
+ }
+ }
+ return NULL;
+}
+
+
+wxHtmlCell *wxHtmlContainerCell::FindCellByPos(wxCoord x, wxCoord y) const
+{
+ for ( const wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext() )
{
- r = m_Cells->Find(condition, param);
- if (r) return r;
+ int cx = cell->GetPosX(),
+ cy = cell->GetPosY();
+
+ if ( (cx <= x) && (cx + cell->GetWidth() > x) &&
+ (cy <= y) && (cy + cell->GetHeight() > y) )
+ {
+ return cell->FindCellByPos(x - cx, y - cy);
+ }
}
- return wxHtmlCell::Find(condition, param);
+ return NULL;
}
-
void wxHtmlContainerCell::OnMouseClick(wxWindow *parent, int x, int y, const wxMouseEvent& event)
{
- if (m_Cells)
+ wxHtmlCell *cell = FindCellByPos(x, y);
+ if ( cell )
+ cell->OnMouseClick(parent, x, y, event);
+}
+
+
+
+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())
{
- wxHtmlCell *c = m_Cells;
- while (c)
- {
- if ( (c->GetPosX() <= x) &&
- (c->GetPosY() <= y) &&
- (c->GetPosX() + c->GetWidth() > x) &&
- (c->GetPosY() + c->GetHeight() > y))
- {
- c->OnMouseClick(parent, x - c->GetPosX(), y - c->GetPosY(), event);
- break;
- }
- c = c->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;
}
// wxHtmlColourCell
//--------------------------------------------------------------------------------
-void wxHtmlColourCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
+void wxHtmlColourCell::Draw(wxDC& dc, int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(view_y1), int WXUNUSED(view_y2))
{
if (m_Flags & wxHTML_CLR_FOREGROUND)
dc.SetTextForeground(m_Colour);
- if (m_Flags & wxHTML_CLR_BACKGROUND)
+ if (m_Flags & wxHTML_CLR_BACKGROUND)
{
dc.SetBackground(wxBrush(m_Colour, wxSOLID));
dc.SetTextBackground(m_Colour);
}
- wxHtmlCell::Draw(dc, x, y, view_y1, view_y2);
}
-void wxHtmlColourCell::DrawInvisible(wxDC& dc, int x, int y)
+void wxHtmlColourCell::DrawInvisible(wxDC& dc, int WXUNUSED(x), int WXUNUSED(y))
{
if (m_Flags & wxHTML_CLR_FOREGROUND)
dc.SetTextForeground(m_Colour);
- if (m_Flags & wxHTML_CLR_BACKGROUND)
+ if (m_Flags & wxHTML_CLR_BACKGROUND)
{
dc.SetBackground(wxBrush(m_Colour, wxSOLID));
dc.SetTextBackground(m_Colour);
}
- wxHtmlCell::DrawInvisible(dc, x, y);
}
// wxHtmlFontCell
//--------------------------------------------------------------------------------
-void wxHtmlFontCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
+void wxHtmlFontCell::Draw(wxDC& dc, int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(view_y1), int WXUNUSED(view_y2))
{
dc.SetFont(m_Font);
- wxHtmlCell::Draw(dc, x, y, view_y1, view_y2);
}
-void wxHtmlFontCell::DrawInvisible(wxDC& dc, int x, int y)
+void wxHtmlFontCell::DrawInvisible(wxDC& dc, int WXUNUSED(x), int WXUNUSED(y))
{
dc.SetFont(m_Font);
- wxHtmlCell::DrawInvisible(dc, x, y);
}
}
-void wxHtmlWidgetCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
+void wxHtmlWidgetCell::Draw(wxDC& WXUNUSED(dc), int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(view_y1), int WXUNUSED(view_y2))
{
int absx = 0, absy = 0, stx, sty;
wxHtmlCell *c = this;
- while (c)
+ while (c)
{
absx += c->GetPosX();
absy += c->GetPosY();
c = c->GetParent();
}
- ((wxScrolledWindow*)(m_Wnd->GetParent()))->ViewStart(&stx, &sty);
+ ((wxScrolledWindow*)(m_Wnd->GetParent()))->GetViewStart(&stx, &sty);
m_Wnd->SetSize(absx - wxHTML_SCROLL_STEP * stx, absy - wxHTML_SCROLL_STEP * sty, m_Width, m_Height);
-
- wxHtmlCell::Draw(dc, x, y, view_y1, view_y2);
}
-void wxHtmlWidgetCell::DrawInvisible(wxDC& dc, int x, int y)
+void wxHtmlWidgetCell::DrawInvisible(wxDC& WXUNUSED(dc), int WXUNUSED(x), int WXUNUSED(y))
{
int absx = 0, absy = 0, stx, sty;
wxHtmlCell *c = this;
- while (c)
+ while (c)
{
absx += c->GetPosX();
absy += c->GetPosY();
c = c->GetParent();
}
- ((wxScrolledWindow*)(m_Wnd->GetParent()))->ViewStart(&stx, &sty);
+ ((wxScrolledWindow*)(m_Wnd->GetParent()))->GetViewStart(&stx, &sty);
m_Wnd->SetSize(absx - wxHTML_SCROLL_STEP * stx, absy - wxHTML_SCROLL_STEP * sty, m_Width, m_Height);
-
- wxHtmlCell::DrawInvisible(dc, x, y);
}
void wxHtmlWidgetCell::Layout(int w)
{
- if (m_WidthFloat != 0)
+ if (m_WidthFloat != 0)
{
m_Width = (w * m_WidthFloat) / 100;
m_Wnd->SetSize(m_Width, m_Height);
projects / wxWidgets.git / blobdiff