X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/efba2b89f15ba8757a722fc56c67f434cf960482..80a24267cbc17d85e278e1f10cdfdaea12199639:/src/html/m_hline.cpp?ds=sidebyside diff --git a/src/html/m_hline.cpp b/src/html/m_hline.cpp index 3fbad4d47c..ba68587175 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,17 +11,17 @@ #pragma implementation #endif -#include +#include "wx/wxprec.h" #include "wx/defs.h" -#if wxUSE_HTML +#if wxUSE_HTML && wxUSE_STREAMS #ifdef __BORDLANDC__ #pragma hdrstop #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) //----------------------------------------------------------------------------- @@ -79,9 +79,9 @@ TAG_HANDLER_BEGIN(HR, "HR") 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();