remove streams tests: they're very basic and already-existing CppUnit stream tests...

[wxWidgets.git] / src / html / m_list.cpp

diff --git a/src/html/m_list.cpp b/src/html/m_list.cpp
index 8cf30c071c5812404e9b6cfa355c1288cfae9811..a008562b9f2e0c998182b2034d9adde8a345f08a 100644 (file)
--- 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
@@ -46,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();
@@ -98,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)
@@ -258,7 +253,7 @@ TAG_HANDLER_BEGIN(OLULLI, "OL,UL,LI")
             {
                 c->SetAlignHor(wxHTML_ALIGN_RIGHT);
                 wxString markStr;
-                markStr.Printf(wxT("%i."), m_Numbering);
+                markStr.Printf(wxT("%i. "), m_Numbering);
                 c->InsertCell(new wxHtmlWordCell(markStr, *(m_WParser->GetDC())));
             }
             m_WParser->CloseContainer();