Added wxMSW wxChoice::GetClassDefaultAttributes(), initially used in wxComboCtrl

[wxWidgets.git] / src / os2 / dcprint.cpp

diff --git a/src/os2/dcprint.cpp b/src/os2/dcprint.cpp
index a861f3363dfb37847f78cd5aa416c22fcdaac81b..918ff77c9cdbd4bd3d57ab46b040eff8fd93fdbe 100644 (file)
--- a/src/os2/dcprint.cpp
+++ b/src/os2/dcprint.cpp
@@ -138,7 +138,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 +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) )