X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2c24e7adf051b2b522bcfc70d3ca70b07c206275..27d79a5027bee4f46e57c813d072422065cb1592:/src/os2/dcprint.cpp diff --git a/src/os2/dcprint.cpp b/src/os2/dcprint.cpp index a861f3363d..1e26861b14 100644 --- a/src/os2/dcprint.cpp +++ b/src/os2/dcprint.cpp @@ -86,10 +86,8 @@ bool wxPrinterDCImpl::StartDoc(const wxString& WXUNUSED(rsMessage)) else docinfo.lpszOutput = (const wxChar *) filename; -#if defined(__WIN95__) docinfo.lpszDatatype = NULL; docinfo.fwType = 0; -#endif if (!m_hDC) return false; @@ -138,7 +136,7 @@ void wxPrinterDCImpl::EndPage() // ::EndPage((HDC) m_hDC); } // end of wxPrinterDC::EndPage -wxRect wxPrinterDCImpl::GetPaperRect() +wxRect wxPrinterDCImpl::GetPaperRect() const { // Use page rect if we can't get paper rect. wxCoord w, h; @@ -215,14 +213,14 @@ WXHDC WXDLLEXPORT wxGetPrinterDC( const wxPrintData& WXUNUSED(rPrintDataConst) ) wxPrintData printData = printDataConst; printData.ConvertToNative(); - wxChar* driverName = (wxChar*) NULL; + wxChar* driverName = NULL; wxString devNameStr = printData.GetPrinterName(); wxChar* deviceName; - wxChar* portName = (wxChar*) NULL; // Obsolete in WIN32 + wxChar* portName = NULL; // Obsolete in WIN32 if (devNameStr.empty()) - deviceName = (wxChar*) NULL; + deviceName = NULL; else deviceName = WXSTRINGCAST devNameStr; @@ -261,7 +259,7 @@ void wxPrinterDCImpl::DoDrawBitmap( const wxBitmap& rBmp, wxCoord WXUNUSED(vY), bool WXUNUSED(bUseMask)) { - wxCHECK_RET( rBmp.Ok(), _T("invalid bitmap in wxPrinterDC::DrawBitmap") ); + wxCHECK_RET( rBmp.IsOk(), wxT("invalid bitmap in wxPrinterDC::DrawBitmap") ); // int nWidth = rBmp.GetWidth(); // int nHeight = rBmp.GetHeight(); @@ -277,7 +275,7 @@ bool wxPrinterDCImpl::DoBlit( wxCoord WXUNUSED(vXdest), wxDC* WXUNUSED(pSource), wxCoord WXUNUSED(vXsrc), wxCoord WXUNUSED(vYsrc), - int WXUNUSED(nRop), + wxRasterOperationMode WXUNUSED(nRop), bool WXUNUSED(bUseMask), wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask) )