X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8da2fe8b423303b23fc9eb88a2ddfa2f5cdff55a..bb69632a56a827bed4cfae842bfffa88259ac1aa:/src/html/m_list.cpp diff --git a/src/html/m_list.cpp b/src/html/m_list.cpp index 9dc8f018a9..98f1d2b9b1 100644 --- a/src/html/m_list.cpp +++ b/src/html/m_list.cpp @@ -1,26 +1,21 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: m_list.cpp +// Name: src/html/m_list.cpp // Purpose: wxHtml module for lists // Author: Vaclav Slavik // RCS-ID: $Id$ // Copyright: (c) 1999 Vaclav Slavik // 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/dc.h" #endif @@ -49,7 +44,7 @@ class wxHtmlListmarkCell : public wxHtmlCell DECLARE_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(); @@ -257,9 +252,9 @@ TAG_HANDLER_BEGIN(OLULLI, "OL,UL,LI") else { c->SetAlignHor(wxHTML_ALIGN_RIGHT); - wxString mark; - mark.Printf(wxT("%i."), m_Numbering); - c->InsertCell(new wxHtmlWordCell(mark, *(m_WParser->GetDC()))); + wxString markStr; + markStr.Printf(wxT("%i. "), m_Numbering); + c->InsertCell(new wxHtmlWordCell(markStr, *(m_WParser->GetDC()))); } m_WParser->CloseContainer();