X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/285f58ab666d956bdbede9fce33f29113640caa2..12bb29f5432174ecbd65549bda832d70d34a98ae:/src/html/m_hline.cpp diff --git a/src/html/m_hline.cpp b/src/html/m_hline.cpp index b81880687e..c83704ad4c 100644 --- a/src/html/m_hline.cpp +++ b/src/html/m_hline.cpp @@ -1,26 +1,21 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: m_hline.cpp +// Name: src/html/m_hline.cpp // Purpose: wxHtml module for horizontal line (HR tag) // Author: Vaclav Slavik // RCS-ID: $Id$ // Copyright: (c) 1999 Vaclav Slavik -// Licence: wxWindows Licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation -#endif - #include "wx/wxprec.h" - -#include "wx/defs.h" -#if wxUSE_HTML && wxUSE_STREAMS #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif -#ifndef WXPRECOMP +#if wxUSE_HTML && wxUSE_STREAMS + +#ifndef WX_PRECOMP #include "wx/brush.h" #include "wx/pen.h" #include "wx/dc.h" @@ -50,6 +45,8 @@ class wxHtmlLineCell : public wxHtmlCell private: // Should we draw 3-D shading or not bool m_HasShading; + + wxDECLARE_NO_COPY_CLASS(wxHtmlLineCell); }; @@ -57,8 +54,8 @@ 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); + wxBrush mybrush(wxT("GREY"), (m_HasShading) ? wxBRUSHSTYLE_TRANSPARENT : wxBRUSHSTYLE_SOLID); + wxPen mypen(wxT("GREY"), 1, wxPENSTYLE_SOLID); dc.SetBrush(mybrush); dc.SetPen(mypen); dc.DrawRectangle(x + m_PosX, y + m_PosY, m_Width, m_Height); @@ -73,6 +70,7 @@ void wxHtmlLineCell::Draw(wxDC& dc, int x, int y, TAG_HANDLER_BEGIN(HR, "HR") + TAG_HANDLER_CONSTR(HR) { } TAG_HANDLER_PROC(tag) { @@ -95,7 +93,7 @@ TAG_HANDLER_BEGIN(HR, "HR") m_WParser->CloseContainer(); m_WParser->OpenContainer(); - return FALSE; + return false; } TAG_HANDLER_END(HR)