X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8bd72d9065d076d720a57fdd319f967ecf4e5652..636d266b8993dd831aa47bdd7e673be32166b54a:/src/html/m_hline.cpp diff --git a/src/html/m_hline.cpp b/src/html/m_hline.cpp index 77f4abcb64..fa2dba264c 100644 --- a/src/html/m_hline.cpp +++ b/src/html/m_hline.cpp @@ -21,11 +21,11 @@ #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" @@ -43,18 +43,18 @@ class wxHtmlLineCell : public wxHtmlCell 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); + wxBrush mybrush(wxT("BLACK"), wxSOLID); + wxPen mypen(wxT("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); }