X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2c24e7adf051b2b522bcfc70d3ca70b07c206275..62795f413a7222863b4aee76c08764071f94bd87:/src/os2/dcmemory.cpp diff --git a/src/os2/dcmemory.cpp b/src/os2/dcmemory.cpp index d4d5ec937c..9950c287b6 100644 --- a/src/os2/dcmemory.cpp +++ b/src/os2/dcmemory.cpp @@ -4,7 +4,6 @@ // Author: David Webster // Modified by: // Created: 10/14/99 -// RCS-ID: $Id$ // Copyright: (c) David Webster // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -29,25 +28,25 @@ IMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxPMDCImpl) // Memory DC ///////////////////////////////////////////////////////////////////////////// -wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner ) +wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner ) : wxPMDCImpl( owner ) { - CreateCompatible(NULL); - Init(); + CreateCompatible(NULL); + Init(); } -wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap ) - : wxPMDCImpl( owner ) -{ - CreateCompatible(NULL); - Init(); +wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap ) + : wxPMDCImpl( owner ) +{ + CreateCompatible(NULL); + Init(); DoSelect(bitmap); } wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxDC *pOldDC) - : wxPMDCImpl( owner ) + : wxPMDCImpl( owner ) { - wxCHECK_RET( pOldDC, _T("NULL dc in wxMemoryDC ctor") ); + wxCHECK_RET( pOldDC, wxT("NULL dc in wxMemoryDC ctor") ); CreateCompatible(pOldDC); Init(); @@ -139,7 +138,7 @@ void wxMemoryDCImpl::DoSelect( if (m_hOldBitmap) { ::GpiSetBitmap(m_hPS, NULLHANDLE); - if (m_vSelectedBitmap.Ok()) + if (m_vSelectedBitmap.IsOk()) { m_vSelectedBitmap.SetSelectedInto(NULL); m_vSelectedBitmap = wxNullBitmap; @@ -201,7 +200,7 @@ void wxMemoryDCImpl::DoGetSize( , int* pHeight ) const { - if (!m_vSelectedBitmap.Ok()) + if (!m_vSelectedBitmap.IsOk()) { *pWidth = 0; *pHeight = 0;