activate new xpm handler under Classic Mac OS after xpm handler fixes

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

diff --git a/src/mac/carbon/dcmemory.cpp b/src/mac/carbon/dcmemory.cpp
index 28a652368a97e41c1058b70f1469f67367563a3d..3f1d4c83fff5f2706b78ee3ebad63658b544423f 100644 (file)
--- a/src/mac/carbon/dcmemory.cpp
+++ b/src/mac/carbon/dcmemory.cpp
@@ -23,20 +23,38 @@ IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxPaintDC)
 
 wxMemoryDC::wxMemoryDC(void)
 {
+  m_ok = TRUE;
+    SetBackground(*wxWHITE_BRUSH);
+    SetBrush(*wxWHITE_BRUSH);
+    SetPen(*wxBLACK_PEN);
   m_ok = FALSE;
 };
 
 wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
 {
+ m_ok = TRUE;
+    SetBackground(*wxWHITE_BRUSH);
+    SetBrush(*wxWHITE_BRUSH);
+    SetPen(*wxBLACK_PEN);
   m_ok = FALSE;
 };
 
 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())
   {
@@ -44,7 +62,12 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
                if ( bmap->m_hBitmap )
                {
                        m_macPort = (GrafPtr) bmap->m_hBitmap ;
-                       MacSetupPort() ;
+                       LockPixels( GetGWorldPixMap(  (CGrafPtr)  m_macPort ) ) ;
+                       wxMask * mask = bitmap.GetMask() ;
+                       if ( mask )
+                       {
+                               m_macMask = mask->GetMaskBitmap() ;
+                       }
                        m_ok = TRUE ;
                        // SetBackground(wxBrush(*wxWHITE, wxSOLID));
                }
@@ -59,7 +82,7 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
   };
 };
 
-void wxMemoryDC::GetSize( int *width, int *height ) const
+void wxMemoryDC::DoGetSize( int *width, int *height ) const
 {
   if (m_selected.Ok())
   {