X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/519cb848a8f4c91c73421bb75314754284e593a4..b12e1d2fcd5ee2771a4ed1904d462fb516adb05f:/src/mac/dcmemory.cpp

diff --git a/src/mac/dcmemory.cpp b/src/mac/dcmemory.cpp
index 28a652368a..5e3f603ce8 100644
--- a/src/mac/dcmemory.cpp
+++ b/src/mac/dcmemory.cpp
@@ -14,6 +14,7 @@
 #endif
 
 #include "wx/dcmemory.h"
+#include "wx/mac/private.h"
 
 //-----------------------------------------------------------------------------
 // wxMemoryDC
@@ -22,44 +23,67 @@
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxPaintDC)
 
 wxMemoryDC::wxMemoryDC(void)
+    : m_selected()
 {
+  m_ok = TRUE;
+    SetBackground(*wxWHITE_BRUSH);
+    SetBrush(*wxWHITE_BRUSH);
+    SetPen(*wxBLACK_PEN);
   m_ok = FALSE;
 };
 
 wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
+    : m_selected()
 {
+  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(MAC_WXHBITMAP(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(MAC_WXHBITMAP(m_selected.GetHBITMAP())) );
+	}
+    m_selected = bitmap;
+    if (m_selected.Ok())
+    {
+		if ( m_selected.GetHBITMAP() )
 		{
-			m_macPort = (GrafPtr) bmap->m_hBitmap ;
-			MacSetupPort() ;
+			m_macPort = (GrafPtr) m_selected.GetHBITMAP() ;
+			LockPixels( GetGWorldPixMap(  (CGrafPtr)  m_macPort ) ) ;
+			wxMask * mask = bitmap.GetMask() ;
+			if ( mask )
+			{
+				m_macMask = mask->GetMaskBitmap() ;
+			}
+        	SetRectRgn( (RgnHandle) m_macBoundaryClipRgn , 0 , 0 , m_selected.GetWidth() , m_selected.GetHeight() ) ;
+        	CopyRgn( (RgnHandle) m_macBoundaryClipRgn ,(RgnHandle)  m_macCurrentClipRgn ) ;
  			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())
   {
@@ -70,7 +94,7 @@ void wxMemoryDC::GetSize( int *width, int *height ) const
   {
     if (width) (*width) = 0;
     if (height) (*height) = 0;
-  };
-};
+  }
+}