X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5c33522fca7cddc441a316f5b9fb50d7685435ba..b5aaf62e977b828214d65c3712478410fb2c8a05:/src/msw/dcprint.cpp?ds=inline diff --git a/src/msw/dcprint.cpp b/src/msw/dcprint.cpp index 4b5b72c7a1..9ca81119cb 100644 --- a/src/msw/dcprint.cpp +++ b/src/msw/dcprint.cpp @@ -83,7 +83,7 @@ wxPrinterDC::wxPrinterDC(const wxString& driver_name, const wxString& device_name, const wxString& file, bool interactive, - int orientation) + wxPrintOrientation orientation) { m_isInteractive = interactive; @@ -228,7 +228,7 @@ void wxPrinterDCImpl::EndPage() } -wxRect wxPrinterDCImpl::GetPaperRect() +wxRect wxPrinterDCImpl::GetPaperRect() const { if (!IsOk()) return wxRect(0, 0, 0, 0); @@ -340,7 +340,9 @@ WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& printDataConst) static_cast(lockDevMode.Get()) ); if ( !hDC ) - wxLogLastError(_T("CreateDC(printer)")); + { + wxLogLastError(wxT("CreateDC(printer)")); + } return (WXHDC) hDC; #endif // PostScript/Windows printing @@ -365,7 +367,7 @@ bool DrawBitmapUsingStretchDIBits(HDC hdc, DIBSECTION ds; if ( !::GetObject(dib.GetHandle(), sizeof(ds), &ds) ) { - wxLogLastError(_T("GetObject(DIBSECTION)")); + wxLogLastError(wxT("GetObject(DIBSECTION)")); return false; } @@ -399,7 +401,7 @@ void wxPrinterDCImpl::DoDrawBitmap(const wxBitmap& bmp, wxCoord x, wxCoord y, bool useMask) { - wxCHECK_RET( bmp.Ok(), _T("invalid bitmap in wxPrinterDC::DrawBitmap") ); + wxCHECK_RET( bmp.Ok(), wxT("invalid bitmap in wxPrinterDC::DrawBitmap") ); int width = bmp.GetWidth(), height = bmp.GetHeight(); @@ -422,7 +424,7 @@ bool wxPrinterDCImpl::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxDC *source, wxCoord WXUNUSED(xsrc), wxCoord WXUNUSED(ysrc), - int WXUNUSED(rop), bool useMask, + wxRasterOperationMode WXUNUSED(rop), bool useMask, wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask)) { wxDCImpl *impl = source->GetImpl();