Fix for the wrong painting rectangle being set.

[wxWidgets.git] / src / mac / dcmemory.cpp

diff --git a/src/mac/dcmemory.cpp b/src/mac/dcmemory.cpp
index 7cbd330821f76b4c97a124689b631d859e829e03..a56c7b5c49b033b771acc2b887c094a266dd4dfb 100644 (file)
--- a/src/mac/dcmemory.cpp
+++ b/src/mac/dcmemory.cpp
@@ -33,13 +33,41 @@ wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
 
 wxMemoryDC::~wxMemoryDC(void)
 {
+       if ( m_selected.Ok() )
+       {
+               wxBitmapRefData * bmap = (wxBitmapRefData*) (m_selected.GetRefData()) ;
+               UnlockPixels( GetGWorldPixMap(  (CGrafPtr) bmap->m_hBitmap ) ) ;
+       }
 };
 
 void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
 {
+       if ( m_selected.Ok() )
+       {
+               wxBitmapRefData * bmap = (wxBitmapRefData*) (m_selected.GetRefData()) ;
+               UnlockPixels( GetGWorldPixMap(  (CGrafPtr) bmap->m_hBitmap ) ) ;
+       }
   m_selected = bitmap;
   if (m_selected.Ok())
   {
+               wxBitmapRefData * bmap = (wxBitmapRefData*) (m_selected.GetRefData()) ;
+               if ( bmap->m_hBitmap )
+               {
+                       m_macPort = (GrafPtr) bmap->m_hBitmap ;
+                       LockPixels( GetGWorldPixMap(  (CGrafPtr)  m_macPort ) ) ;
+                       wxMask * mask = bitmap.GetMask() ;
+                       if ( mask )
+                       {
+                               m_macMask = mask->GetMaskBitmap() ;
+                       }
+                       MacSetupPort() ;
+                       m_ok = TRUE ;
+                       // SetBackground(wxBrush(*wxWHITE, wxSOLID));
+               }
+               else
+               {
+           m_ok = FALSE;
+               }
   }
   else
   {