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 d8396837c4da5146624bc10e19b1a5f349eb71e7..1c424417fe79102fbb4ffe0e5853e9a84554a35f 100644 (file)
--- 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 cb542c34f8c1b2d98b5b93803b40eab8eb8f93c9..749af4a4f05326c714f1afb65351229da7972024 100644 (file)
--- 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();