X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..e828d3fc808bf4b76e256afe8da5d268fb684735:/src/html/m_hline.cpp?ds=sidebyside diff --git a/src/html/m_hline.cpp b/src/html/m_hline.cpp index 7556e33039..fc875b6b8f 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$ @@ -7,20 +7,15 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#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" @@ -59,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); @@ -98,7 +93,7 @@ TAG_HANDLER_BEGIN(HR, "HR") m_WParser->CloseContainer(); m_WParser->OpenContainer(); - return FALSE; + return false; } TAG_HANDLER_END(HR)