X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/51072df23ffcf5bdd4651dbe0ad5143b1e360119..d8c5974799b29e0a0382ffca9c9db9377581bbd4:/src/html/m_hline.cpp diff --git a/src/html/m_hline.cpp b/src/html/m_hline.cpp index b9df229000..09e2bf50ac 100644 --- a/src/html/m_hline.cpp +++ b/src/html/m_hline.cpp @@ -7,7 +7,7 @@ // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation #endif @@ -16,7 +16,7 @@ #include "wx/defs.h" #if wxUSE_HTML && wxUSE_STREAMS -#ifdef __BORDLANDC__ +#ifdef __BORLANDC__ #pragma hdrstop #endif @@ -42,17 +42,22 @@ class wxHtmlLineCell : public wxHtmlCell { public: wxHtmlLineCell(int size, bool shading) : wxHtmlCell() {m_Height = size; m_HasShading = shading;} - void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2); + void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, + wxHtmlRenderingInfo& info); void Layout(int w) { m_Width = w; wxHtmlCell::Layout(w); } private: // Should we draw 3-D shading or not bool m_HasShading; + + DECLARE_NO_COPY_CLASS(wxHtmlLineCell) }; -void wxHtmlLineCell::Draw(wxDC& dc, int x, int y, int WXUNUSED(view_y1), int WXUNUSED(view_y2)) +void wxHtmlLineCell::Draw(wxDC& dc, int x, int y, + int WXUNUSED(view_y1), int WXUNUSED(view_y2), + wxHtmlRenderingInfo& WXUNUSED(info)) { wxBrush mybrush(wxT("GREY"), (m_HasShading) ? wxTRANSPARENT : wxSOLID); wxPen mypen(wxT("GREY"), 1, wxSOLID); @@ -70,6 +75,7 @@ void wxHtmlLineCell::Draw(wxDC& dc, int x, int y, int WXUNUSED(view_y1), int WXU TAG_HANDLER_BEGIN(HR, "HR") + TAG_HANDLER_CONSTR(HR) { } TAG_HANDLER_PROC(tag) {