Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adaptions for latest dc changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50359 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2007-11-30 16:43:39 +00:00
parent 52018692fa
commit 196fc5f288
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/msw/dcmemory.cpp
View File

@@ -115,7 +115,7 @@ void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap )
// check for whether the bitmap is already selected into a device context // check for whether the bitmap is already selected into a device context
wxASSERT_MSG( !bitmap.GetSelectedInto() || wxASSERT_MSG( !bitmap.GetSelectedInto() ||
(bitmap.GetSelectedInto() == this), (bitmap.GetSelectedInto() == GetOwner()),
wxT("Bitmap is selected in another wxMemoryDC, delete the first wxMemoryDC or use SelectObject(NULL)") ); wxT("Bitmap is selected in another wxMemoryDC, delete the first wxMemoryDC or use SelectObject(NULL)") );
m_selectedBitmap = bitmap; m_selectedBitmap = bitmap;
@@ -124,7 +124,7 @@ void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap )
return; return;
#ifdef __WXDEBUG__ #ifdef __WXDEBUG__
m_selectedBitmap.SetSelectedInto(this); m_selectedBitmap.SetSelectedInto(GetOwner());
#endif #endif
hBmp = (WXHBITMAP)::SelectObject(GetHdc(), (HBITMAP)hBmp); hBmp = (WXHBITMAP)::SelectObject(GetHdc(), (HBITMAP)hBmp);