Applied patch [ 845171 ] Use transparancy mask in wxBitmapShape

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/src/ogl/bmpshape.cpp b/contrib/src/ogl/bmpshape.cpp
index f0b1c9ca068e6b3afe8366dc35d9333a708c39dd..359457b8ff28ce0fc3779c2a7ce4c6eeb43f9110 100644 (file)
--- a/contrib/src/ogl/bmpshape.cpp
+++ b/contrib/src/ogl/bmpshape.cpp
@@ -52,12 +52,10 @@ void wxBitmapShape::OnDraw(wxDC& dc)
   if (!m_bitmap.Ok())
     return;
 
   if (!m_bitmap.Ok())
     return;
 

-  wxMemoryDC tempDC;
-  tempDC.SelectObject(m_bitmap);

   double x, y;
   x = WXROUND(m_xpos - m_bitmap.GetWidth() / 2.0);
   y = WXROUND(m_ypos - m_bitmap.GetHeight() / 2.0);
   double x, y;
   x = WXROUND(m_xpos - m_bitmap.GetWidth() / 2.0);
   y = WXROUND(m_ypos - m_bitmap.GetHeight() / 2.0);

-  dc.Blit((long) x, (long) y, m_bitmap.GetWidth(), m_bitmap.GetHeight(), &tempDC, 0, 0);
+  dc.DrawBitmap(m_bitmap, x, y, true);

 }
 
 void wxBitmapShape::SetSize(double w, double h, bool WXUNUSED(recursive))
 }
 
 void wxBitmapShape::SetSize(double w, double h, bool WXUNUSED(recursive))