AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed an apparent bug in DetermineScaling()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2002-03-30 19:57:43 +00:00
parent a17a79bac3
commit f4fefc232b
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/msw/printwin.cpp
View File

@ -373,9 +373,7 @@ void wxWindowsPrintPreview::DetermineScaling()
{ {
HDC dc = ::GetDC(NULL); HDC dc = ::GetDC(NULL);
int screenWidth = ::GetDeviceCaps(dc, HORZSIZE); int screenWidth = ::GetDeviceCaps(dc, HORZSIZE);
// int screenHeight = ::GetDeviceCaps(dc, VERTSIZE); int screenYRes = ::GetDeviceCaps(dc, VERTRES);
int screenXRes = ::GetDeviceCaps(dc, HORZRES);
// int screenYRes = ::GetDeviceCaps(dc, VERTRES);
int logPPIScreenX = ::GetDeviceCaps(dc, LOGPIXELSX); int logPPIScreenX = ::GetDeviceCaps(dc, LOGPIXELSX);
int logPPIScreenY = ::GetDeviceCaps(dc, LOGPIXELSY); int logPPIScreenY = ::GetDeviceCaps(dc, LOGPIXELSY);
m_previewPrintout->SetPPIScreen(logPPIScreenX, logPPIScreenY); m_previewPrintout->SetPPIScreen(logPPIScreenX, logPPIScreenY);
@ -390,15 +388,16 @@ void wxWindowsPrintPreview::DetermineScaling()
int printerXRes = 1500; int printerXRes = 1500;
int printerYRes = 2500; int printerYRes = 2500;
if (printerDC.GetHDC()) dc = GetHdcOf(printerDC);
if ( dc )
{ {
printerWidth = ::GetDeviceCaps((HDC) printerDC.GetHDC(), HORZSIZE); printerWidth = ::GetDeviceCaps(dc, HORZSIZE);
printerHeight = ::GetDeviceCaps((HDC) printerDC.GetHDC(), VERTSIZE); printerHeight = ::GetDeviceCaps(dc, VERTSIZE);
printerXRes = ::GetDeviceCaps((HDC) printerDC.GetHDC(), HORZRES); printerXRes = ::GetDeviceCaps(dc, HORZRES);
printerYRes = ::GetDeviceCaps((HDC) printerDC.GetHDC(), VERTRES); printerYRes = ::GetDeviceCaps(dc, VERTRES);
int logPPIPrinterX = ::GetDeviceCaps((HDC) printerDC.GetHDC(), LOGPIXELSX); int logPPIPrinterX = ::GetDeviceCaps(dc, LOGPIXELSX);
int logPPIPrinterY = ::GetDeviceCaps((HDC) printerDC.GetHDC(), LOGPIXELSY); int logPPIPrinterY = ::GetDeviceCaps(dc, LOGPIXELSY);
m_previewPrintout->SetPPIPrinter(logPPIPrinterX, logPPIPrinterY); m_previewPrintout->SetPPIPrinter(logPPIPrinterX, logPPIPrinterY);
m_previewPrintout->SetPageSizeMM(printerWidth, printerHeight); m_previewPrintout->SetPageSizeMM(printerWidth, printerHeight);
@ -414,7 +413,7 @@ void wxWindowsPrintPreview::DetermineScaling()
// At 100%, the page should look about page-size on the screen. // At 100%, the page should look about page-size on the screen.
m_previewScale = (float)((float)screenWidth/(float)printerWidth); m_previewScale = (float)((float)screenWidth/(float)printerWidth);
m_previewScale = m_previewScale * (float)((float)screenXRes/(float)printerYRes); m_previewScale = m_previewScale * (float)((float)screenYRes/(float)printerYRes);
} }
/**************************************************************************** /****************************************************************************