X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3dec57adfdb2469b7679930092f0bd9c8569d62c..6cef0db28018fd2644ee4e38af715872e5242459:/src/mac/carbon/dcmemory.cpp?ds=sidebyside

diff --git a/src/mac/carbon/dcmemory.cpp b/src/mac/carbon/dcmemory.cpp
index 85f1af33c5..f1086953b4 100644
--- a/src/mac/carbon/dcmemory.cpp
+++ b/src/mac/carbon/dcmemory.cpp
@@ -1,95 +1,115 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dcmemory.cpp
+// Name:        src/mac/carbon/dcmemory.cpp
 // Purpose:     wxMemoryDC class
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:   	wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "dcmemory.h"
-#endif
+#include "wx/wxprec.h"
 
 #include "wx/dcmemory.h"
+#include "wx/graphics.h"
+
+#include "wx/mac/private.h"
 
 //-----------------------------------------------------------------------------
-// wxMemoryDC
+// wxMemoryDCImpl
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxPaintDC)
+IMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl,wxPaintDCImpl)
+
 
-wxMemoryDC::wxMemoryDC(void)
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner )
+  : wxPaintDCImpl( owner )
 {
-  m_ok = TRUE;
-    SetBackground(*wxWHITE_BRUSH);
-    SetBrush(*wxWHITE_BRUSH);
-    SetPen(*wxBLACK_PEN);
-  m_ok = FALSE;
-};
+    Init();
+}
+
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap )
+  : wxPaintDCImpl( owner )
+{
+    Init();
+    DoSelect(bitmap);
+}
+
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxDC * WXUNUSED(dc) )
+  : wxPaintDCImpl( owner )
+{
+    Init();
+}
 
-wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
+void wxMemoryDCImpl::Init()
 {
- m_ok = TRUE;
+    m_ok = true;
     SetBackground(*wxWHITE_BRUSH);
     SetBrush(*wxWHITE_BRUSH);
     SetPen(*wxBLACK_PEN);
-  m_ok = FALSE;
-};
+    SetFont(*wxNORMAL_FONT);
+    m_ok = false;
+}
 
-wxMemoryDC::~wxMemoryDC()
+wxMemoryDCImpl::~wxMemoryDCImpl()
 {
-	if ( m_selected.Ok() )
-	{
- 		UnlockPixels( GetGWorldPixMap(m_selected.GetHBITMAP()) );
-	}
-};
+    if ( m_selected.Ok() )
+    {
+        m_selected.EndRawAccess() ;
+        delete m_graphicContext ;
+        m_graphicContext = NULL ;
+    }
+}
 
-void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
+void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap )
 {
-	if ( m_selected.Ok() )
-	{
- 		UnlockPixels( GetGWorldPixMap(m_selected.GetHBITMAP()) );
-	}
+    if ( m_selected.Ok() )
+    {
+        m_selected.EndRawAccess() ;
+        delete m_graphicContext ;
+        m_graphicContext = NULL ;
+    }
+
     m_selected = bitmap;
     if (m_selected.Ok())
     {
-		if ( m_selected.GetHBITMAP() )
-		{
-			m_macPort = (GrafPtr) m_selected.GetHBITMAP() ;
-			LockPixels( GetGWorldPixMap(  (CGrafPtr)  m_macPort ) ) ;
-			wxMask * mask = bitmap.GetMask() ;
-			if ( mask )
-			{
-				m_macMask = mask->GetMaskBitmap() ;
-			}
- 			m_ok = TRUE ;
- 		}
- 		else
- 		{
-	        m_ok = FALSE;
- 		}
-  }
-  else
-  {
-    m_ok = FALSE;
-  }
+        if ( m_selected.GetDepth() != 1 )
+            m_selected.UseAlpha() ;
+        m_selected.BeginRawAccess() ;
+		m_width = bitmap.GetWidth();
+		m_height = bitmap.GetHeight();
+        CGColorSpaceRef genericColorSpace  = wxMacGetGenericRGBColorSpace();
+        CGContextRef bmCtx = (CGContextRef) m_selected.GetHBITMAP();
+
+        if ( bmCtx )
+        {
+            CGContextSetFillColorSpace( bmCtx, genericColorSpace );
+            CGContextSetStrokeColorSpace( bmCtx, genericColorSpace );
+			SetGraphicsContext( wxGraphicsContext::CreateFromNative( bmCtx ) );
+        }
+        m_ok = (m_graphicContext != NULL) ;
+    }
+    else
+    {
+        m_ok = false;
+    }
 }
 
-void wxMemoryDC::DoGetSize( int *width, int *height ) const
+void wxMemoryDCImpl::DoGetSize( int *width, int *height ) const
 {
-  if (m_selected.Ok())
-  {
-    if (width) (*width) = m_selected.GetWidth();
-    if (height) (*height) = m_selected.GetHeight();
-  }
-  else
-  {
-    if (width) (*width) = 0;
-    if (height) (*height) = 0;
-  }
+    if (m_selected.Ok())
+    {
+        if (width)
+            (*width) = m_selected.GetWidth();
+        if (height)
+            (*height) = m_selected.GetHeight();
+    }
+    else
+    {
+        if (width)
+            (*width) = 0;
+        if (height)
+            (*height) = 0;
+    }
 }
-
-