projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update m_lastcount correctly in wxBufferedInputStream::Read() when using the buffer...
[wxWidgets.git]
/
src
/
generic
/
printps.cpp
diff --git
a/src/generic/printps.cpp
b/src/generic/printps.cpp
index 18653aa45d3a03c71cdd8295fb1571390299d132..5a13e0120d20d4d9cf5aa7236f16978f8113d6d4 100644
(file)
--- a/
src/generic/printps.cpp
+++ b/
src/generic/printps.cpp
@@
-101,7
+101,7
@@
bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro
}
// May have pressed cancel.
}
// May have pressed cancel.
- if (!dc || !dc->Ok())
+ if (!dc || !dc->
Is
Ok())
{
if (dc) delete dc;
sm_lastError = wxPRINTER_ERROR;
{
if (dc) delete dc;
sm_lastError = wxPRINTER_ERROR;
@@
-113,8
+113,8
@@
bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro
printout->SetPPIScreen( (int) ((ScreenPixels.GetWidth() * 25.4) / ScreenMM.GetWidth()),
(int) ((ScreenPixels.GetHeight() * 25.4) / ScreenMM.GetHeight()) );
printout->SetPPIScreen( (int) ((ScreenPixels.GetWidth() * 25.4) / ScreenMM.GetWidth()),
(int) ((ScreenPixels.GetHeight() * 25.4) / ScreenMM.GetHeight()) );
- printout->SetPPIPrinter(
wxPostScriptDC::
GetResolution(),
-
wxPostScriptDC::
GetResolution() );
+ printout->SetPPIPrinter(
dc->
GetResolution(),
+
dc->
GetResolution() );
// Set printout parameters
printout->SetDC(dc);
// Set printout parameters
printout->SetDC(dc);
@@
-122,8
+122,10
@@
bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro
int w, h;
dc->GetSize(&w, &h);
printout->SetPageSizePixels((int)w, (int)h);
int w, h;
dc->GetSize(&w, &h);
printout->SetPageSizePixels((int)w, (int)h);
- dc->GetSizeMM(&w, &h);
- printout->SetPageSizeMM((int)w, (int)h);
+ printout->SetPaperRectPixels(wxRect(0, 0, w, h));
+ int mw, mh;
+ dc->GetSizeMM(&mw, &mh);
+ printout->SetPageSizeMM((int)mw, (int)mh);
// Create an abort window
wxBeginBusyCursor();
// Create an abort window
wxBeginBusyCursor();
@@
-333,13
+335,15
@@
void wxPostScriptPrintPreview::DetermineScaling()
wxSize ScreenPixels = wxGetDisplaySize();
wxSize ScreenMM = wxGetDisplaySizeMM();
wxSize ScreenPixels = wxGetDisplaySize();
wxSize ScreenMM = wxGetDisplaySizeMM();
+ int resolution = 600; // TODO, this is correct, but get this from wxPSDC somehow
+
m_previewPrintout->SetPPIScreen( (int) ((ScreenPixels.GetWidth() * 25.4) / ScreenMM.GetWidth()),
(int) ((ScreenPixels.GetHeight() * 25.4) / ScreenMM.GetHeight()) );
m_previewPrintout->SetPPIScreen( (int) ((ScreenPixels.GetWidth() * 25.4) / ScreenMM.GetWidth()),
(int) ((ScreenPixels.GetHeight() * 25.4) / ScreenMM.GetHeight()) );
- m_previewPrintout->SetPPIPrinter(
wxPostScriptDC::GetResolution(), wxPostScriptDC::GetResolution()
);
+ m_previewPrintout->SetPPIPrinter(
resolution, resolution
);
wxSize sizeDevUnits(paper->GetSizeDeviceUnits());
wxSize sizeDevUnits(paper->GetSizeDeviceUnits());
- sizeDevUnits.x = (wxCoord)((float)sizeDevUnits.x *
wxPostScriptDC::GetResolution()
/ 72.0);
- sizeDevUnits.y = (wxCoord)((float)sizeDevUnits.y *
wxPostScriptDC::GetResolution()
/ 72.0);
+ sizeDevUnits.x = (wxCoord)((float)sizeDevUnits.x *
resolution
/ 72.0);
+ sizeDevUnits.y = (wxCoord)((float)sizeDevUnits.y *
resolution
/ 72.0);
wxSize sizeTenthsMM(paper->GetSize());
wxSize sizeMM(sizeTenthsMM.x / 10, sizeTenthsMM.y / 10);
wxSize sizeTenthsMM(paper->GetSize());
wxSize sizeMM(sizeTenthsMM.x / 10, sizeTenthsMM.y / 10);
@@
-349,18
+353,19
@@
void wxPostScriptPrintPreview::DetermineScaling()
m_pageWidth = sizeDevUnits.y;
m_pageHeight = sizeDevUnits.x;
m_previewPrintout->SetPageSizeMM(sizeMM.y, sizeMM.x);
m_pageWidth = sizeDevUnits.y;
m_pageHeight = sizeDevUnits.x;
m_previewPrintout->SetPageSizeMM(sizeMM.y, sizeMM.x);
- m_previewPrintout->SetPageSizePixels(m_pageWidth, m_pageHeight);
}
else
{
m_pageWidth = sizeDevUnits.x;
m_pageHeight = sizeDevUnits.y;
m_previewPrintout->SetPageSizeMM(sizeMM.x, sizeMM.y);
}
else
{
m_pageWidth = sizeDevUnits.x;
m_pageHeight = sizeDevUnits.y;
m_previewPrintout->SetPageSizeMM(sizeMM.x, sizeMM.y);
- m_previewPrintout->SetPageSizePixels(m_pageWidth, m_pageHeight);
}
}
+ m_previewPrintout->SetPageSizePixels(m_pageWidth, m_pageHeight);
+ m_previewPrintout->SetPaperRectPixels(wxRect(0, 0, m_pageWidth, m_pageHeight));
// 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)0.8 * 72.0 / (float)wxPostScriptDC::GetResolution();
+ m_previewScaleX = (float)0.8 * 72.0 / (float)resolution;
+ m_previewScaleY = m_previewScaleX;
}
}
}
}