X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6d52ca536a0ecb6e69474d30461f6128497505a0..68f64b40bfdffd1fc4967dc422a7d89b42545d82:/src/os2/dcprint.cpp diff --git a/src/os2/dcprint.cpp b/src/os2/dcprint.cpp index 9c0f88cc2b..918ff77c9c 100644 --- a/src/os2/dcprint.cpp +++ b/src/os2/dcprint.cpp @@ -215,14 +215,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 +261,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.Ok(), wxT("invalid bitmap in wxPrinterDC::DrawBitmap") ); // int nWidth = rBmp.GetWidth(); // int nHeight = rBmp.GetHeight(); @@ -277,7 +277,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) )