X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/html/m_hline.cpp diff --git a/src/html/m_hline.cpp b/src/html/m_hline.cpp index 80f433c441..c83704ad4c 100644 --- a/src/html/m_hline.cpp +++ b/src/html/m_hline.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: m_hline.cpp +// Name: src/html/m_hline.cpp // Purpose: wxHtml module for horizontal line (HR tag) // Author: Vaclav Slavik // RCS-ID: $Id$ @@ -9,13 +9,13 @@ #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" @@ -46,7 +46,7 @@ class wxHtmlLineCell : public wxHtmlCell // Should we draw 3-D shading or not bool m_HasShading; - DECLARE_NO_COPY_CLASS(wxHtmlLineCell) + wxDECLARE_NO_COPY_CLASS(wxHtmlLineCell); }; @@ -54,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);