X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9de1027152fd1bd3e8c0d9b5e9f4b19b0bbc3a10..37106ab28e52bf3257b67df8d9c60d61ecb67bdf:/src/os2/dc.cpp?ds=sidebyside diff --git a/src/os2/dc.cpp b/src/os2/dc.cpp index 09fe982e45..efce57c91e 100644 --- a/src/os2/dc.cpp +++ b/src/os2/dc.cpp @@ -25,10 +25,9 @@ #include "wx/msgdlg.h" #include "wx/dcprint.h" #include "wx/statusbr.h" + #include "wx/module.h" #endif -#include "wx/module.h" - #include #include "wx/os2/private.h" @@ -657,7 +656,7 @@ void wxDC::DoDrawLine( } else { - if (m_vSelectedBitmap != wxNullBitmap) + if (m_vSelectedBitmap.Ok()) { m_vRclPaint.yTop = m_vSelectedBitmap.GetHeight(); m_vRclPaint.xRight = m_vSelectedBitmap.GetWidth(); @@ -987,7 +986,7 @@ void wxDC::DoDrawRectangle( vY = OS2Y(vY,vHeight); else { - if (m_vSelectedBitmap != wxNullBitmap) + if (m_vSelectedBitmap.Ok()) { m_vRclPaint.yTop = m_vSelectedBitmap.GetHeight(); m_vRclPaint.xRight = m_vSelectedBitmap.GetWidth(); @@ -1077,7 +1076,7 @@ void wxDC::DoDrawRoundedRectangle( vY = OS2Y(vY,vHeight); else { - if (m_vSelectedBitmap != wxNullBitmap) + if (m_vSelectedBitmap.Ok()) { m_vRclPaint.yTop = m_vSelectedBitmap.GetHeight(); m_vRclPaint.xRight = m_vSelectedBitmap.GetWidth(); @@ -1744,7 +1743,7 @@ void wxDC::DrawAnyText( const wxString& rsText, } else { - if (m_vSelectedBitmap != wxNullBitmap) + if (m_vSelectedBitmap.Ok()) { m_vRclPaint.yTop = m_vSelectedBitmap.GetHeight(); m_vRclPaint.xRight = m_vSelectedBitmap.GetWidth();