X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f38924e863cd44e2abd49d20d201d72aa773c51e..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/mac/carbon/dcmemory.cpp

diff --git a/src/mac/carbon/dcmemory.cpp b/src/mac/carbon/dcmemory.cpp
index 79ef4ee3cc..f1086953b4 100644
--- a/src/mac/carbon/dcmemory.cpp
+++ b/src/mac/carbon/dcmemory.cpp
@@ -12,28 +12,37 @@
 #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()
-: m_selected()
+
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner )
+  : wxPaintDCImpl( owner )
 {
-    m_ok = true;
-    SetBackground(*wxWHITE_BRUSH);
-    SetBrush(*wxWHITE_BRUSH);
-    SetPen(*wxBLACK_PEN);
-    SetFont(*wxNORMAL_FONT);
-    m_ok = false;
+    Init();
 }
 
-wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
-: m_selected()
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap )
+  : wxPaintDCImpl( owner )
+{
+    Init();
+    DoSelect(bitmap);
+}
+
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxDC * WXUNUSED(dc) )
+  : wxPaintDCImpl( owner )
+{
+    Init();
+}
+
+void wxMemoryDCImpl::Init()
 {
     m_ok = true;
     SetBackground(*wxWHITE_BRUSH);
@@ -43,80 +52,43 @@ wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
     m_ok = false;
 }
 
-wxMemoryDC::~wxMemoryDC()
+wxMemoryDCImpl::~wxMemoryDCImpl()
 {
     if ( m_selected.Ok() )
     {
-#if wxMAC_USE_CORE_GRAPHICS
         m_selected.EndRawAccess() ;
-        CGContextRef bmCtx = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ;
         delete m_graphicContext ;
         m_graphicContext = NULL ;
-        CGContextRelease( bmCtx ) ;
-#else
-// TODO: UnlockPixels( GetGWorldPixMap(MAC_WXHBITMAP(m_selected.GetHBITMAP())) );
-#endif
     }
 }
 
-void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
+void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap )
 {
     if ( m_selected.Ok() )
     {
-#if wxMAC_USE_CORE_GRAPHICS
         m_selected.EndRawAccess() ;
-        CGContextRef bmCtx = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ;
         delete m_graphicContext ;
         m_graphicContext = NULL ;
-        CGContextRelease( bmCtx ) ;
-#else
-// TODO: UnlockPixels( GetGWorldPixMap(MAC_WXHBITMAP(m_selected.GetHBITMAP())) );
-#endif
     }
 
     m_selected = bitmap;
     if (m_selected.Ok())
     {
-#if wxMAC_USE_CORE_GRAPHICS
-        m_selected.UseAlpha() ;
-        void * data = m_selected.BeginRawAccess() ;
-
-        int bitsPerComp = 8 ;
-        int bytesPerPixel = 4 ;
-        int w = bitmap.GetWidth() ;
-        int h = bitmap.GetHeight() ;
-
-        // TODO: should this be kCGImageAlphaPremultiplied[First,Last] ?
-        CGImageAlphaInfo a = kCGImageAlphaNoneSkipFirst ;
-
+        if ( m_selected.GetDepth() != 1 )
+            m_selected.UseAlpha() ;
+        m_selected.BeginRawAccess() ;
+		m_width = bitmap.GetWidth();
+		m_height = bitmap.GetHeight();
         CGColorSpaceRef genericColorSpace  = wxMacGetGenericRGBColorSpace();
-        CGContextRef bmCtx = CGBitmapContextCreate( data , w, h, bitsPerComp , bytesPerPixel * w , genericColorSpace, a );
-        wxASSERT_MSG( bmCtx , wxT("Unable to create bitmap context") ) ;
+        CGContextRef bmCtx = (CGContextRef) m_selected.GetHBITMAP();
 
         if ( bmCtx )
         {
             CGContextSetFillColorSpace( bmCtx, genericColorSpace );
             CGContextSetStrokeColorSpace( bmCtx, genericColorSpace );
-
-            CGContextTranslateCTM( bmCtx , 0 ,  m_selected.GetHeight() ) ;
-            CGContextScaleCTM( bmCtx , 1 , -1 ) ;
-
-            m_graphicContext = new wxMacCGContext( bmCtx ) ;
-            m_graphicContext->SetPen( m_pen ) ;
-            m_graphicContext->SetBrush( m_brush ) ;
+			SetGraphicsContext( wxGraphicsContext::CreateFromNative( bmCtx ) );
         }
         m_ok = (m_graphicContext != NULL) ;
-
-#else
-        m_macPort = m_selected.GetHBITMAP( &m_macMask ) ;
-        m_ok = (m_macPort != NULL) ;
-        if (m_ok)
-        {
-            LockPixels( GetGWorldPixMap( (CGrafPtr) m_macPort ) ) ;
-            SetRectRgn( (RgnHandle) m_macBoundaryClipRgn , 0 , 0 , m_selected.GetWidth() , m_selected.GetHeight() ) ;
-            CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
-        }
-#endif
     }
     else
     {
@@ -124,7 +96,7 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
     }
 }
 
-void wxMemoryDC::DoGetSize( int *width, int *height ) const
+void wxMemoryDCImpl::DoGetSize( int *width, int *height ) const
 {
     if (m_selected.Ok())
     {