Document the cfstring.h/cfstring.cpp as being used by all Darwin ports (it's

[wxWidgets.git] / src / mac / carbon / dcmemory.cpp

diff --git a/src/mac/carbon/dcmemory.cpp b/src/mac/carbon/dcmemory.cpp
index 393e0a23c223b2e270165bf465fe8117e676e393..cc8c8115ee0f7fa1c0cdfc6a1c038969c9556c0f 100644 (file)
--- 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/wxprec.h"
 
 #include "wx/dcmemory.h"

+#include "wx/graphics.h"

 
 #include "wx/mac/private.h"
 
 
 #include "wx/mac/private.h"
 


@@ -21,8 +22,7 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxPaintDC)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxPaintDC)
 

-wxMemoryDC::wxMemoryDC( const wxBitmap& bitmap )
-: m_selected()
+void wxMemoryDC::Init()

 {
     m_ok = true;
     SetBackground(*wxWHITE_BRUSH);
 {
     m_ok = true;
     SetBackground(*wxWHITE_BRUSH);


@@ -30,20 +30,12 @@ wxMemoryDC::wxMemoryDC( const wxBitmap& bitmap )
     SetPen(*wxBLACK_PEN);
     SetFont(*wxNORMAL_FONT);
     m_ok = false;
     SetPen(*wxBLACK_PEN);
     SetFont(*wxNORMAL_FONT);
     m_ok = false;

-
-    if ( bitmap.IsOk() )
-        SelectObject(bitmap);

 }
 
 wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
 : m_selected()
 {
 }
 
 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()
 }
 
 wxMemoryDC::~wxMemoryDC()


@@ -52,26 +44,22 @@ wxMemoryDC::~wxMemoryDC()
     {
 #if wxMAC_USE_CORE_GRAPHICS
         m_selected.EndRawAccess() ;
     {
 #if wxMAC_USE_CORE_GRAPHICS
         m_selected.EndRawAccess() ;

-        CGContextRef bmCtx = (CGContextRef) m_graphicContext->GetNativeContext() ;

         delete m_graphicContext ;
         m_graphicContext = NULL ;
         delete m_graphicContext ;
         m_graphicContext = NULL ;

-        CGContextRelease( bmCtx ) ;

 #else
 // TODO: UnlockPixels( GetGWorldPixMap(MAC_WXHBITMAP(m_selected.GetHBITMAP())) );
 #endif
     }
 }
 
 #else
 // TODO: UnlockPixels( GetGWorldPixMap(MAC_WXHBITMAP(m_selected.GetHBITMAP())) );
 #endif
     }
 }
 

-void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
+void wxMemoryDC::DoSelect( const wxBitmap& bitmap )

 {
     if ( m_selected.Ok() )
     {
 #if wxMAC_USE_CORE_GRAPHICS
         m_selected.EndRawAccess() ;
 {
     if ( m_selected.Ok() )
     {
 #if wxMAC_USE_CORE_GRAPHICS
         m_selected.EndRawAccess() ;

-        CGContextRef bmCtx = (CGContextRef) m_graphicContext->GetNativeContext() ;

         delete m_graphicContext ;
         m_graphicContext = NULL ;
         delete m_graphicContext ;
         m_graphicContext = NULL ;

-        CGContextRelease( bmCtx ) ;

 #else
 // TODO: UnlockPixels( GetGWorldPixMap(MAC_WXHBITMAP(m_selected.GetHBITMAP())) );
 #endif
 #else
 // TODO: UnlockPixels( GetGWorldPixMap(MAC_WXHBITMAP(m_selected.GetHBITMAP())) );
 #endif


@@ -83,34 +71,17 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
 #if wxMAC_USE_CORE_GRAPHICS
         if ( m_selected.GetDepth() != 1 )
             m_selected.UseAlpha() ;
 #if wxMAC_USE_CORE_GRAPHICS
         if ( m_selected.GetDepth() != 1 )
             m_selected.UseAlpha() ;

-        void * data = m_selected.BeginRawAccess() ;
-
-        int bitsPerComp = 8 ;
-        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 ;
-
+        m_selected.BeginRawAccess() ;
+               m_width = bitmap.GetWidth();
+               m_height = bitmap.GetHeight();

         CGColorSpaceRef genericColorSpace  = wxMacGetGenericRGBColorSpace();
         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 );
 
         if ( bmCtx )
         {
             CGContextSetFillColorSpace( bmCtx, genericColorSpace );
             CGContextSetStrokeColorSpace( bmCtx, genericColorSpace );

-
-            CGContextTranslateCTM( bmCtx , 0 ,  m_selected.GetHeight() ) ;
-            CGContextScaleCTM( bmCtx , 1 , -1 ) ;
-

                        SetGraphicsContext( wxGraphicsContext::CreateFromNative( bmCtx ) );
                        SetGraphicsContext( wxGraphicsContext::CreateFromNative( bmCtx ) );

-            m_graphicContext->SetPen( m_pen ) ;
-            m_graphicContext->SetBrush( m_brush ) ;
-            m_graphicContext->SetFont( m_font ) ;

         }
         m_ok = (m_graphicContext != NULL) ;
 
         }
         m_ok = (m_graphicContext != NULL) ;