Patch from Bo for recent API changes

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

diff --git a/src/html/m_list.cpp b/src/html/m_list.cpp
index 844cc73d71a4c92cbc9570d5b6006a3ccb24452c..10750a39eada578dc2da77e6fb0811b12f63f927 100644 (file)
--- 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$
 // Purpose:     wxHtml module for lists
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$


@@ -9,14 +9,13 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

-#include "wx/defs.h"
-#if wxUSE_HTML && wxUSE_STREAMS
-

 #ifdef __BORLANDC__
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-#ifndef WXPRECOMP
+#if wxUSE_HTML && wxUSE_STREAMS
+
+#ifndef WX_PRECOMP

     #include "wx/brush.h"
     #include "wx/dc.h"
 #endif
     #include "wx/brush.h"
     #include "wx/dc.h"
 #endif


@@ -254,7 +253,7 @@ TAG_HANDLER_BEGIN(OLULLI, "OL,UL,LI")
             {
                 c->SetAlignHor(wxHTML_ALIGN_RIGHT);
                 wxString markStr;
             {
                 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();
                 c->InsertCell(new wxHtmlWordCell(markStr, *(m_WParser->GetDC())));
             }
             m_WParser->CloseContainer();