From: Vadim Zeitlin Date: Fri, 3 Nov 2006 17:37:36 +0000 (+0000) Subject: use wxMemoryDC::SelectObjectAsSource() for const wxBitmaps X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/cf6824d93de87e00c2a7659e9c405ecf9bf87d5c?ds=inline use wxMemoryDC::SelectObjectAsSource() for const wxBitmaps git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42983 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/mgl/bitmap.cpp b/src/mgl/bitmap.cpp index d8396837c4..1c424417fe 100644 --- a/src/mgl/bitmap.cpp +++ b/src/mgl/bitmap.cpp @@ -647,7 +647,7 @@ bool wxMGLBitmapHandler::SaveFile(const wxBitmap *bitmap, const wxString& name, int w = bitmap->GetWidth(), h = bitmap->GetHeight(); - mem.SelectObject(*bitmap); + mem.SelectObjectAsSource(*bitmap); tdc = mem.GetMGLDC(); switch (type) diff --git a/src/mgl/brush.cpp b/src/mgl/brush.cpp index cb542c34f8..749af4a4f0 100644 --- a/src/mgl/brush.cpp +++ b/src/mgl/brush.cpp @@ -35,7 +35,7 @@ void wxBitmapToPixPattern(const wxBitmap& bitmap, if ( pix != NULL ) { - mem.SelectObject(bitmap); + mem.SelectObjectAsSource(bitmap); dc = mem.GetMGLDC(); wxCurrentDCSwitcher curDC(dc); dc->beginPixel(); @@ -50,7 +50,7 @@ void wxBitmapToPixPattern(const wxBitmap& bitmap, if ( mask && bitmap.GetMask() ) { - mem.SelectObject(bitmap.GetMask()->GetBitmap()); + mem.SelectObjectAsSource(bitmap.GetMask()->GetBitmap()); dc = mem.GetMGLDC(); wxCurrentDCSwitcher curDC(dc); dc->beginPixel();