cosmetic fixes to font encoding names

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

diff --git a/src/html/m_hline.cpp b/src/html/m_hline.cpp
index 76130b09d3d44e5c626f77dc1a73d56029f2f88a..ba6858717516fb6c50e3b7666498150f5a243da8 100644 (file)
--- a/src/html/m_hline.cpp
+++ b/src/html/m_hline.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        mod_hline.cpp
+// Name:        m_hline.cpp
 // Purpose:     wxHtml module for horizontal line (HR tag)
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
@@ -11,17 +11,17 @@
 #pragma implementation
 #endif
 
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"
 
 
 #include "wx/defs.h"
-#if wxUSE_HTML
+#if wxUSE_HTML && wxUSE_STREAMS
 #ifdef __BORDLANDC__
 #pragma hdrstop
 #endif
 
 #ifndef WXPRECOMP
-#include <wx/wx.h>
+#include "wx/wx.h"
 #endif
 
 
@@ -31,7 +31,7 @@
 
 #include "wx/html/htmlcell.h"
 
-FORCE_LINK_ME(mod_hline)
+FORCE_LINK_ME(m_hline)
 
 
 //-----------------------------------------------------------------------------
@@ -75,13 +75,13 @@ TAG_HANDLER_BEGIN(HR, "HR")
         m_WParser -> CloseContainer();
         c = m_WParser -> OpenContainer();
 
-        c -> SetIndent(m_WParser -> GetCharHeight(), HTML_INDENT_VERTICAL);
-        c -> SetAlignHor(HTML_ALIGN_CENTER);
+        c -> SetIndent(m_WParser -> GetCharHeight(), wxHTML_INDENT_VERTICAL);
+        c -> SetAlignHor(wxHTML_ALIGN_CENTER);
         c -> SetAlign(tag);
         c -> SetWidthFloat(tag);
-        if (tag.HasParam("SIZE") && tag.ScanParam("SIZE", "%i", &sz) == 1) {}
-        else sz = 1;
-        c -> InsertCell(new wxHtmlLineCell(sz));
+        sz = 1;
+        if (tag.HasParam(wxT("SIZE")) && tag.ScanParam(wxT("SIZE"), wxT("%i"), &sz) == 1) {}
+        c -> InsertCell(new wxHtmlLineCell((int)((double)sz * m_WParser -> GetPixelScale())));
 
         m_WParser -> CloseContainer();
         m_WParser -> OpenContainer();