applied correction from Marc Newsam in calculations of linesize

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

diff --git a/src/mac/carbon/dcmemory.cpp b/src/mac/carbon/dcmemory.cpp
index fe88bf806cfa070d3f05e15e107f8f80ede1df6d..a56c7b5c49b033b771acc2b887c094a266dd4dfb 100644 (file)
--- a/src/mac/carbon/dcmemory.cpp
+++ b/src/mac/carbon/dcmemory.cpp
@@ -33,10 +33,20 @@ wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
 
 wxMemoryDC::~wxMemoryDC(void)
 {
 
 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 )
 {
 };
 
 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())
   {
   m_selected = bitmap;
   if (m_selected.Ok())
   {


@@ -44,6 +54,7 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
                if ( bmap->m_hBitmap )
                {
                        m_macPort = (GrafPtr) bmap->m_hBitmap ;
                if ( bmap->m_hBitmap )
                {
                        m_macPort = (GrafPtr) bmap->m_hBitmap ;

+                       LockPixels( GetGWorldPixMap(  (CGrafPtr)  m_macPort ) ) ;

                        wxMask * mask = bitmap.GetMask() ;
                        if ( mask )
                        {
                        wxMask * mask = bitmap.GetMask() ;
                        if ( mask )
                        {