X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8208e181cb576ec6cda37624923f95a59af43072..ed582841a275d236b9bac7651a0f3e7c91be868d:/src/mac/carbon/dcmemory.cpp

diff --git a/src/mac/carbon/dcmemory.cpp b/src/mac/carbon/dcmemory.cpp
index fe88bf806c..85f1af33c5 100644
--- a/src/mac/carbon/dcmemory.cpp
+++ b/src/mac/carbon/dcmemory.cpp
@@ -23,48 +23,62 @@ 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)
+wxMemoryDC::~wxMemoryDC()
 {
+	if ( m_selected.Ok() )
+	{
+ 		UnlockPixels( GetGWorldPixMap(m_selected.GetHBITMAP()) );
+	}
 };
 
 void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
 {
-  m_selected = bitmap;
-  if (m_selected.Ok())
-  {
-		wxBitmapRefData * bmap = (wxBitmapRefData*) (m_selected.GetRefData()) ;
-		if ( bmap->m_hBitmap )
+	if ( m_selected.Ok() )
+	{
+ 		UnlockPixels( GetGWorldPixMap(m_selected.GetHBITMAP()) );
+	}
+    m_selected = bitmap;
+    if (m_selected.Ok())
+    {
+		if ( m_selected.GetHBITMAP() )
 		{
-			m_macPort = (GrafPtr) bmap->m_hBitmap ;
+			m_macPort = (GrafPtr) m_selected.GetHBITMAP() ;
+			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;
+	        m_ok = FALSE;
  		}
   }
   else
   {
     m_ok = FALSE;
-  };
-};
+  }
+}
 
-void wxMemoryDC::GetSize( int *width, int *height ) const
+void wxMemoryDC::DoGetSize( int *width, int *height ) const
 {
   if (m_selected.Ok())
   {
@@ -75,7 +89,7 @@ void wxMemoryDC::GetSize( int *width, int *height ) const
   {
     if (width) (*width) = 0;
     if (height) (*height) = 0;
-  };
-};
+  }
+}