X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/62fa228ac1bb940b38b67df4c3087ef9ffa581b0..2ee322d90c0c0f39d4a3c5f0c942bbda4c7baa1a:/src/mac/carbon/dcmemory.cpp diff --git a/src/mac/carbon/dcmemory.cpp b/src/mac/carbon/dcmemory.cpp index 20c371825a..f30ed64d0f 100644 --- a/src/mac/carbon/dcmemory.cpp +++ b/src/mac/carbon/dcmemory.cpp @@ -12,6 +12,7 @@ #include "wx/wxprec.h" #include "wx/dcmemory.h" +#include "wx/graphics.h" #include "wx/mac/private.h" @@ -21,8 +22,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxPaintDC) -wxMemoryDC::wxMemoryDC() -: m_selected() +void wxMemoryDC::Init() { m_ok = true; SetBackground(*wxWHITE_BRUSH); @@ -35,12 +35,7 @@ wxMemoryDC::wxMemoryDC() wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) ) : m_selected() { - m_ok = true; - SetBackground(*wxWHITE_BRUSH); - SetBrush(*wxWHITE_BRUSH); - SetPen(*wxBLACK_PEN); - SetFont(*wxNORMAL_FONT); - m_ok = false; + Init(); } wxMemoryDC::~wxMemoryDC() @@ -49,7 +44,7 @@ wxMemoryDC::~wxMemoryDC() { #if wxMAC_USE_CORE_GRAPHICS m_selected.EndRawAccess() ; - CGContextRef bmCtx = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; + CGContextRef bmCtx = (CGContextRef) m_graphicContext->GetNativeContext() ; delete m_graphicContext ; m_graphicContext = NULL ; CGContextRelease( bmCtx ) ; @@ -59,13 +54,13 @@ wxMemoryDC::~wxMemoryDC() } } -void wxMemoryDC::SelectObject( const wxBitmap& bitmap ) +void wxMemoryDC::DoSelect( const wxBitmap& bitmap ) { if ( m_selected.Ok() ) { #if wxMAC_USE_CORE_GRAPHICS m_selected.EndRawAccess() ; - CGContextRef bmCtx = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; + CGContextRef bmCtx = (CGContextRef) m_graphicContext->GetNativeContext() ; delete m_graphicContext ; m_graphicContext = NULL ; CGContextRelease( bmCtx ) ; @@ -86,6 +81,8 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap ) int bytesPerPixel = 4 ; int w = bitmap.GetWidth() ; int h = bitmap.GetHeight() ; + m_width = w; + m_height = h; // TODO: should this be kCGImageAlphaPremultiplied[First,Last] ? CGImageAlphaInfo a = kCGImageAlphaNoneSkipFirst ; @@ -102,10 +99,7 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap ) 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 ) ; - m_graphicContext->SetFont( m_font ) ; + SetGraphicsContext( wxGraphicsContext::CreateFromNative( bmCtx ) ); } m_ok = (m_graphicContext != NULL) ;