#endif
#ifndef WXPRECOMP
-#include "wx/wx.h"
+ #include "wx/brush.h"
+ #include "wx/pen.h"
+ #include "wx/dc.h"
#endif
-
-
#include "wx/html/forcelnk.h"
#include "wx/html/m_templ.h"
public:
wxHtmlLineCell(int size) : wxHtmlCell() {m_Height = size;}
void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2);
- void Layout(int w) {m_Width = w; if (m_Next) m_Next->Layout(w);}
+ void Layout(int w)
+ { m_Width = w; wxHtmlCell::Layout(w); }
};
-void wxHtmlLineCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
+void wxHtmlLineCell::Draw(wxDC& dc, int x, int y, int WXUNUSED(view_y1), int WXUNUSED(view_y2))
{
wxBrush mybrush("BLACK", wxSOLID);
wxPen mypen("BLACK", 1, wxSOLID);
dc.SetBrush(mybrush);
dc.SetPen(mypen);
dc.DrawRectangle(x + m_PosX, y + m_PosY, m_Width, m_Height);
- wxHtmlCell::Draw(dc, x, y, view_y1, view_y2);
}
c->SetAlign(tag);
c->SetWidthFloat(tag);
sz = 1;
- if (tag.HasParam(wxT("SIZE")) && tag.ScanParam(wxT("SIZE"), wxT("%i"), &sz) == 1) {}
+ tag.GetParamAsInt(wxT("SIZE"), &sz);
c->InsertCell(new wxHtmlLineCell((int)((double)sz * m_WParser->GetPixelScale())));
m_WParser->CloseContainer();