X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad8dd67e0248959b813797894c4b928f7cd73b84..8059d88d80ab538c27b457cd4f3ffd5298344476:/src/os2/dc.cpp diff --git a/src/os2/dc.cpp b/src/os2/dc.cpp index c8fec9f68f..823467f540 100644 --- a/src/os2/dc.cpp +++ b/src/os2/dc.cpp @@ -4,7 +4,6 @@ // Author: David Webster // Modified by: // Created: 10/14/99 -// RCS-ID: $Id$ // Copyright: (c) David Webster // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -343,7 +342,7 @@ wxPMDCImpl::wxPMDCImpl( wxDC *owner, WXHDC hDC ) : m_hDC = hDC; } // end of wxPMDCImpl::wxPMDCImpl -wxPMDCImpl::~wxPMDCImpl(void) +wxPMDCImpl::~wxPMDCImpl() { if ( m_hDC != 0 ) { @@ -386,7 +385,7 @@ void wxPMDCImpl::SelectOldObjects( if (m_hOldBitmap) { ::GpiSetBitmap(hPS, (HBITMAP) m_hOldBitmap); - if (m_vSelectedBitmap.Ok()) + if (m_vSelectedBitmap.IsOk()) { m_vSelectedBitmap.SetSelectedInto(NULL); } @@ -444,7 +443,7 @@ void wxPMDCImpl::DoSetClippingRegion( DO_SET_CLIPPING_BOX() } // end of wxPMDCImpl::DoSetClippingRegion -void wxPMDCImpl::DoSetClippingRegionAsRegion( +void wxPMDCImpl::DoSetDeviceClippingRegion( const wxRegion& rRegion ) { @@ -457,9 +456,9 @@ void wxPMDCImpl::DoSetClippingRegionAsRegion( ,&hRgnOld ); DO_SET_CLIPPING_BOX() -} // end of wxPMDCImpl::DoSetClippingRegionAsRegion +} // end of wxPMDCImpl::DoSetDeviceClippingRegion -void wxPMDCImpl::DestroyClippingRegion(void) +void wxPMDCImpl::DestroyClippingRegion() { if (m_clipping && m_hPS) { @@ -540,7 +539,7 @@ bool wxPMDCImpl::DoFloodFill( wxCoord vX , wxCoord vY , const wxColour& rCol -, int nStyle +, wxFloodFillStyle nStyle ) { POINTL vPtlPos; @@ -644,7 +643,7 @@ void wxPMDCImpl::DoDrawLine( } else { - if (m_vSelectedBitmap.Ok()) + if (m_vSelectedBitmap.IsOk()) { m_vRclPaint.yTop = m_vSelectedBitmap.GetHeight(); m_vRclPaint.xRight = m_vSelectedBitmap.GetWidth(); @@ -656,7 +655,7 @@ void wxPMDCImpl::DoDrawLine( vPoint[0].y = vY1; vPoint[1].x = vX2; vPoint[1].y = vY2; - if (m_pen.Ok()) + if (m_pen.IsOk()) { vColor = m_pen.GetColour().GetPixel(); } @@ -822,7 +821,7 @@ void wxPMDCImpl::DoDrawPoint( POINTL vPoint; COLORREF vColor = 0x00ffffff; - if (m_pen.Ok()) + if (m_pen.IsOk()) { vColor = m_pen.GetColour().GetPixel(); } @@ -836,10 +835,10 @@ void wxPMDCImpl::DoDrawPoint( } // end of wxPMDCImpl::DoDrawPoint void wxPMDCImpl::DoDrawPolygon( int n, - wxPoint vPoints[], + const wxPoint vPoints[], wxCoord vXoffset, wxCoord vYoffset, - int nFillStyle ) + wxPolygonFillMode nFillStyle ) { ULONG ulCount = 1; // Number of polygons. POLYGON vPlgn; // polygon. @@ -903,14 +902,14 @@ void wxPMDCImpl::DoDrawPolygon( int n, void wxPMDCImpl::DoDrawLines( int n -, wxPoint vPoints[] +, const wxPoint vPoints[] , wxCoord vXoffset , wxCoord vYoffset ) { POINTL vPoint; - if (vXoffset != 0L || vXoffset != 0L) + if (vXoffset != 0L || vYoffset != 0L) { int i; @@ -974,7 +973,7 @@ void wxPMDCImpl::DoDrawRectangle( vY = OS2Y(vY,vHeight); else { - if (m_vSelectedBitmap.Ok()) + if (m_vSelectedBitmap.IsOk()) { m_vRclPaint.yTop = m_vSelectedBitmap.GetHeight(); m_vRclPaint.xRight = m_vSelectedBitmap.GetWidth(); @@ -1064,7 +1063,7 @@ void wxPMDCImpl::DoDrawRoundedRectangle( vY = OS2Y(vY,vHeight); else { - if (m_vSelectedBitmap.Ok()) + if (m_vSelectedBitmap.IsOk()) { m_vRclPaint.yTop = m_vSelectedBitmap.GetHeight(); m_vRclPaint.xRight = m_vSelectedBitmap.GetWidth(); @@ -1359,7 +1358,7 @@ void wxPMDCImpl::DoDrawBitmap( lColor = pWindowDC->m_pCanvas->GetBackgroundColour().GetPixel(); } - else if (GetBrush().Ok()) + else if (GetBrush().IsOk()) lColor = GetBrush().GetColour().GetPixel(); else lColor = m_textBackgroundColour.GetPixel(); @@ -1526,13 +1525,13 @@ void wxPMDCImpl::DoDrawBitmap( ULONG lOldForeGround = ::GpiQueryColor((HPS)GetHPS()); ULONG lOldBackGround = ::GpiQueryBackColor((HPS)GetHPS()); - if (m_textForegroundColour.Ok()) + if (m_textForegroundColour.IsOk()) { ::GpiSetColor( (HPS)GetHPS() ,m_textForegroundColour.GetPixel() ); } - if (m_textBackgroundColour.Ok()) + if (m_textBackgroundColour.IsOk()) { ::GpiSetBackColor( (HPS)GetHPS() ,m_textBackgroundColour.GetPixel() @@ -1579,6 +1578,7 @@ void wxPMDCImpl::DoDrawBitmap( { vError = ::WinGetLastError(vHabmain); sError = wxPMErrorToStr(vError); + delete [] pucBits; return; } if ((lScans = ::GpiQueryBitmapBits( hPS @@ -1590,6 +1590,7 @@ void wxPMDCImpl::DoDrawBitmap( { vError = ::WinGetLastError(vHabmain); sError = wxPMErrorToStr(vError); + delete [] pucBits; return; } unsigned char cOldRedFore = (unsigned char)(lOldForeGround >> 16); @@ -1701,14 +1702,14 @@ void wxPMDCImpl::DrawAnyText( const wxString& rsText, // // Set text color attributes // - if (m_textForegroundColour.Ok()) + if (m_textForegroundColour.IsOk()) { SetTextColor( m_hPS ,(int)m_textForegroundColour.GetPixel() ); } - if (m_textBackgroundColour.Ok()) + if (m_textBackgroundColour.IsOk()) { nOldBackground = SetTextBkColor( m_hPS ,(int)m_textBackgroundColour.GetPixel() @@ -1731,7 +1732,7 @@ void wxPMDCImpl::DrawAnyText( const wxString& rsText, } else { - if (m_vSelectedBitmap.Ok()) + if (m_vSelectedBitmap.IsOk()) { m_vRclPaint.yTop = m_vSelectedBitmap.GetHeight(); m_vRclPaint.xRight = m_vSelectedBitmap.GetWidth(); @@ -1756,7 +1757,7 @@ void wxPMDCImpl::DrawAnyText( const wxString& rsText, // it never is set to anything else, but background should remain // transparent even if we just drew an opaque string) // - if (m_textBackgroundColour.Ok()) + if (m_textBackgroundColour.IsOk()) SetTextBkColor( m_hPS ,nOldBackground ); @@ -1847,7 +1848,7 @@ void wxPMDCImpl::DoSelectPalette( bool WXUNUSED(bRealize) ) m_hOldPalette = 0; } - if (m_palette.Ok()) + if (m_palette.IsOk()) { HPALETTE hOldPal; @@ -1889,7 +1890,7 @@ void wxPMDCImpl::SetPalette( m_hOldFont = 0; } m_palette = rPalette; - if (!rPalette.Ok()) + if (!rPalette.IsOk()) { if (m_hOldFont) { @@ -1914,14 +1915,14 @@ void wxPMDCImpl::SetFont( m_hOldFont = 0; } m_font = rFont; - if (!rFont.Ok()) + if (!rFont.IsOk()) { m_hOldFont = 0; } m_font.SetPS(m_hPS); // this will realize the font - if (m_font.Ok()) + if (m_font.IsOk()) { HFONT hFont = m_font.GetResourceHandle(); if (hFont == (HFONT) NULL) @@ -1940,14 +1941,14 @@ void wxPMDCImpl::SetPen( if (m_pen == rPen) return; m_pen = rPen; - if (!m_pen.Ok()) + if (!m_pen.IsOk()) return; if (m_hOldPen) m_hOldPen = 0L; m_pen = rPen; - if (!m_pen.Ok()) + if (!m_pen.IsOk()) { if (m_hOldPen) { @@ -1956,7 +1957,7 @@ void wxPMDCImpl::SetPen( m_hOldPen = 0L; } - if (m_pen.Ok()) + if (m_pen.IsOk()) { if (m_pen.GetResourceHandle()) { @@ -1975,14 +1976,14 @@ void wxPMDCImpl::SetBrush( if (m_hOldBrush) m_hOldBrush = 0L; m_brush = rBrush; - if (!m_brush.Ok()) + if (!m_brush.IsOk()) if (m_brush == rBrush) return; - if (!m_brush.Ok()) + if (!m_brush.IsOk()) if (m_hOldBrush) m_hOldBrush = 0L; - if (!m_brush.Ok()) + if (!m_brush.IsOk()) { if (m_hOldBrush) { @@ -1991,7 +1992,7 @@ void wxPMDCImpl::SetBrush( m_hOldBrush = 0L; } - if (m_brush.Ok()) + if (m_brush.IsOk()) { if (m_brush.GetResourceHandle()) { @@ -2006,7 +2007,7 @@ void wxPMDCImpl::SetBackground(const wxBrush& rBrush) { m_backgroundBrush = rBrush; - if (m_backgroundBrush.Ok()) + if (m_backgroundBrush.IsOk()) { (void)::GpiSetBackColor((HPS)m_hPS, m_backgroundBrush.GetColour().GetPixel()); } @@ -2017,7 +2018,7 @@ void wxPMDCImpl::SetBackgroundMode(int nMode) m_backgroundMode = nMode; } // end of wxPMDCImpl::SetBackgroundMode -void wxPMDCImpl::SetLogicalFunction(int nFunction) +void wxPMDCImpl::SetLogicalFunction(wxRasterOperationMode nFunction) { m_logicalFunction = nFunction; SetRop((WXHDC)m_hDC); @@ -2160,12 +2161,12 @@ void wxPMDCImpl::DoGetTextExtent( // if (!m_hPS) { - (void)wxMessageBox( _T("wxWidgets core library") - ,"Using uninitialized DC for measuring text!\n" - ,wxICON_INFORMATION - ); + (void)wxMessageBox( wxT("wxWidgets core library") + ,"Using uninitialized DC for measuring text!\n" + ,wxICON_INFORMATION + ); } - + bRc = ::GpiQueryTextBox( m_hPS ,l ,rsString.char_str() @@ -2177,8 +2178,8 @@ void wxPMDCImpl::DoGetTextExtent( vErrorCode = ::WinGetLastError(wxGetInstance()); sError = wxPMErrorToStr(vErrorCode); // DEBUG - wxSprintf(zMsg, _T("GpiQueryTextBox for %s: failed with Error: %lx - %s"), rsString.c_str(), vErrorCode, sError.c_str()); - (void)wxMessageBox( _T("wxWidgets core library") + wxSprintf(zMsg, wxT("GpiQueryTextBox for %s: failed with Error: %lx - %s"), rsString.c_str(), vErrorCode, sError.c_str()); + (void)wxMessageBox( wxT("wxWidgets core library") ,zMsg ,wxICON_INFORMATION ); @@ -2211,7 +2212,7 @@ void wxPMDCImpl::DoGetTextExtent( } void wxPMDCImpl::SetMapMode( - int nMode + wxMappingMode nMode ) { int nPixelWidth = 0; @@ -2285,7 +2286,7 @@ void wxPMDCImpl::SetMapMode( ::GpiSetPS(m_hPS, &vSize, ulOptions); } ComputeScaleAndOrigin(); - + }; // end of wxPMDCImpl::SetMapMode void wxPMDCImpl::SetUserScale( double dX, @@ -2357,7 +2358,7 @@ bool wxPMDCImpl::DoBlit( wxCoord vXdest, wxDC* pSource, wxCoord vXsrc, wxCoord vYsrc, - int nRop, + wxRasterOperationMode nRop, bool bUseMask, wxCoord WXUNUSED(vXsrcMask), wxCoord WXUNUSED(vYsrcMask) ) @@ -2381,7 +2382,7 @@ bool wxPMDCImpl::DoBlit( wxCoord vXdest, const wxBitmap& rBmp = pm_impl->GetSelectedBitmap(); pMask = rBmp.GetMask(); - if (!(rBmp.Ok() && pMask && pMask->GetMaskBitmap())) + if (!(rBmp.IsOk() && pMask && pMask->GetMaskBitmap())) { bUseMask = false; } @@ -2394,7 +2395,7 @@ bool wxPMDCImpl::DoBlit( wxCoord vXdest, ); vOldTextColor = (COLORREF)vCbnd.lColor; - if (m_textForegroundColour.Ok()) + if (m_textForegroundColour.IsOk()) { vCbnd.lColor = (LONG)m_textForegroundColour.GetPixel(); ::GpiSetAttrs( m_hPS // presentation-space handle @@ -2404,7 +2405,7 @@ bool wxPMDCImpl::DoBlit( wxCoord vXdest, ,&vCbnd // buffer for attributes. ); } - if (m_textBackgroundColour.Ok()) + if (m_textBackgroundColour.IsOk()) { ::GpiSetBackColor(m_hPS, (LONG)m_textBackgroundColour.GetPixel()); }