X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/69941f05864fa8b37856ccc1338124bfac756a2b..4c30035625ce9c4980e52db808704b377af12041:/src/html/m_hline.cpp diff --git a/src/html/m_hline.cpp b/src/html/m_hline.cpp index 76130b09d3..fdb5a1fa48 100644 --- 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,7 +11,7 @@ #pragma implementation #endif -#include +#include "wx/wxprec.h" #include "wx/defs.h" @@ -21,7 +21,7 @@ #endif #ifndef WXPRECOMP -#include +#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();