applied patch #103817 to both branches (HTML printing typo in margins code)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9377 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
9c4165adfa
commit
6c5b628eee
@ -192,7 +192,7 @@ bool wxHtmlPrintout::OnBeginDocument(int startPage, int endPage)
|
|||||||
/* prepare headers/footers renderer: */
|
/* prepare headers/footers renderer: */
|
||||||
|
|
||||||
m_RendererHdr->SetDC(GetDC(), (double)ppiPrinterY / (double)ppiScreenY);
|
m_RendererHdr->SetDC(GetDC(), (double)ppiPrinterY / (double)ppiScreenY);
|
||||||
m_RendererHdr->SetSize((int) (ppmm_h * (mm_w - m_MarginLeft - m_MarginTop)),
|
m_RendererHdr->SetSize((int) (ppmm_h * (mm_w - m_MarginLeft - m_MarginRight)),
|
||||||
(int) (ppmm_v * (mm_h - m_MarginTop - m_MarginBottom)));
|
(int) (ppmm_v * (mm_h - m_MarginTop - m_MarginBottom)));
|
||||||
if (m_Headers[0] != wxEmptyString)
|
if (m_Headers[0] != wxEmptyString)
|
||||||
{
|
{
|
||||||
@ -217,7 +217,7 @@ bool wxHtmlPrintout::OnBeginDocument(int startPage, int endPage)
|
|||||||
|
|
||||||
/* prepare main renderer: */
|
/* prepare main renderer: */
|
||||||
m_Renderer->SetDC(GetDC(), (double)ppiPrinterY / (double)ppiScreenY);
|
m_Renderer->SetDC(GetDC(), (double)ppiPrinterY / (double)ppiScreenY);
|
||||||
m_Renderer->SetSize((int) (ppmm_h * (mm_w - m_MarginLeft - m_MarginTop)),
|
m_Renderer->SetSize((int) (ppmm_h * (mm_w - m_MarginLeft - m_MarginRight)),
|
||||||
(int) (ppmm_v * (mm_h - m_MarginTop - m_MarginBottom) -
|
(int) (ppmm_v * (mm_h - m_MarginTop - m_MarginBottom) -
|
||||||
m_FooterHeight - m_HeaderHeight -
|
m_FooterHeight - m_HeaderHeight -
|
||||||
((m_HeaderHeight == 0) ? 0 : m_MarginSpace * ppmm_v) -
|
((m_HeaderHeight == 0) ? 0 : m_MarginSpace * ppmm_v) -
|
||||||
|
Loading…
Reference in New Issue
Block a user