X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3d941982deab17cc12e7fa02c76700840c7cf66c..08670ea85abf4b4946a9ce64971b591d7b1ee30b:/src/html/m_list.cpp?ds=sidebyside diff --git a/src/html/m_list.cpp b/src/html/m_list.cpp index 97864acc7c..a008562b9f 100644 --- a/src/html/m_list.cpp +++ b/src/html/m_list.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: m_list.cpp +// Name: src/html/m_list.cpp // Purpose: wxHtml module for lists // Author: Vaclav Slavik // RCS-ID: $Id$ @@ -9,14 +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/dc.h" #endif @@ -42,10 +41,10 @@ class wxHtmlListmarkCell : public wxHtmlCell void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, wxHtmlRenderingInfo& info); - DECLARE_NO_COPY_CLASS(wxHtmlListmarkCell) + wxDECLARE_NO_COPY_CLASS(wxHtmlListmarkCell); }; -wxHtmlListmarkCell::wxHtmlListmarkCell(wxDC* dc, const wxColour& clr) : wxHtmlCell(), m_Brush(clr, wxSOLID) +wxHtmlListmarkCell::wxHtmlListmarkCell(wxDC* dc, const wxColour& clr) : wxHtmlCell(), m_Brush(clr, wxBRUSHSTYLE_SOLID) { m_Width = dc->GetCharHeight(); m_Height = dc->GetCharHeight(); @@ -94,7 +93,7 @@ class wxHtmlListCell : public wxHtmlContainerCell void AddRow(wxHtmlContainerCell *mark, wxHtmlContainerCell *cont); virtual void Layout(int w); - DECLARE_NO_COPY_CLASS(wxHtmlListCell) + wxDECLARE_NO_COPY_CLASS(wxHtmlListCell); }; wxHtmlListCell::wxHtmlListCell(wxHtmlContainerCell *parent) : wxHtmlContainerCell(parent)