From: Václav Slavík Date: Mon, 29 Mar 2010 14:18:58 +0000 (+0000) Subject: Removed useless wxDisplaySize() calls from wxHtmlPrintout. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/5a21001cddffc56634f037b565d413230926d5d3 Removed useless wxDisplaySize() calls from wxHtmlPrintout. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp index 6a22f88547..3b628934c5 100644 --- a/src/html/htmprint.cpp +++ b/src/html/htmprint.cpp @@ -236,7 +236,7 @@ wxHtmlPrintout::CheckFit(const wxSize& pageArea, const wxSize& docArea) const void wxHtmlPrintout::OnPreparePrinting() { - int pageWidth, pageHeight, mm_w, mm_h, scr_w, scr_h, dc_w, dc_h; + int pageWidth, pageHeight, mm_w, mm_h, dc_w, dc_h; float ppmm_h, ppmm_v; GetPageSizePixels(&pageWidth, &pageHeight); @@ -251,7 +251,6 @@ void wxHtmlPrintout::OnPreparePrinting() GetPPIScreen(&ppiScreenX, &ppiScreenY); wxUnusedVar(ppiScreenX); - wxDisplaySize(&scr_w, &scr_h); GetDC()->GetSize(&dc_w, &dc_h); GetDC()->SetUserScale((double)dc_w / (double)pageWidth, @@ -457,14 +456,13 @@ void wxHtmlPrintout::RenderPage(wxDC *dc, int page) { wxBusyCursor wait; - int pageWidth, pageHeight, mm_w, mm_h, scr_w, scr_h, dc_w, dc_h; + int pageWidth, pageHeight, mm_w, mm_h, dc_w, dc_h; float ppmm_h, ppmm_v; GetPageSizePixels(&pageWidth, &pageHeight); GetPageSizeMM(&mm_w, &mm_h); ppmm_h = (float)pageWidth / mm_w; ppmm_v = (float)pageHeight / mm_h; - wxDisplaySize(&scr_w, &scr_h); dc->GetSize(&dc_w, &dc_h); int ppiPrinterX, ppiPrinterY;