From d5536adedfb59e4a5792234e6a28949535e13369 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 26 Jan 2000 14:08:11 +0000 Subject: [PATCH] wxDC::Blit() ignores useMask if there is no mask instead of giving an assert failure git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/dc.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp index f8c01f727d..0744dc251e 100644 --- a/src/msw/dc.cpp +++ b/src/msw/dc.cpp @@ -1255,8 +1255,12 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, const wxBitmap& bmp = source->m_selectedBitmap; mask = bmp.GetMask(); - wxCHECK_MSG( bmp.Ok() && mask && mask->GetMaskBitmap(), FALSE, - _T("can't blit with mask without mask") ); + if ( !(bmp.Ok() && mask && mask->GetMaskBitmap()) ) + { + // don't give assert here because this would break existing + // programs - just silently ignore useMask parameter + useMask = FALSE; + } } COLORREF old_textground = ::GetTextColor(GetHdc());