Mac compilation fix after const patch

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

diff --git a/src/mac/carbon/dcmemory.cpp b/src/mac/carbon/dcmemory.cpp
index d4db46174e6cce6ae64ea89c95322db5cd9c0ddb..fb8cd48fb7b5a34957d7ac041b52377980288cb2 100644 (file)
--- a/src/mac/carbon/dcmemory.cpp
+++ b/src/mac/carbon/dcmemory.cpp
@@ -6,12 +6,10 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:    wxWindows licence
+// Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "dcmemory.h"
-#endif
+#include "wx/wxprec.h"
 
 #include "wx/dcmemory.h"
 #include "wx/mac/private.h"
@@ -23,78 +21,124 @@
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxPaintDC)
 
 wxMemoryDC::wxMemoryDC(void)
-    : m_selected()
+: m_selected()
 {
-  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( wxDC *WXUNUSED(dc) )
-    : m_selected()
+: m_selected()
 {
-  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()
 {
-       if ( m_selected.Ok() )
-       {
-               UnlockPixels( GetGWorldPixMap(MAC_WXHBITMAP(m_selected.GetHBITMAP())) );
-       }
+    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 )
 {
-       if ( m_selected.Ok() )
-       {
-               UnlockPixels( GetGWorldPixMap(MAC_WXHBITMAP(m_selected.GetHBITMAP())) );
-       }
+    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 ( m_selected.GetHBITMAP() )
-               {
-                       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 ;
-               }
-               else
-               {
-               m_ok = FALSE;
-               }
-  }
-  else
-  {
-    m_ok = FALSE;
-  }
+#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() ;
+        CGImageAlphaInfo a = kCGImageAlphaNoneSkipFirst ; 
+        CGColorSpaceRef genericColorSpace  = wxMacGetGenericRGBColorSpace();
+        CGContextRef bmCtx = CGBitmapContextCreate(data , w, h, bitsPerComp , bytesPerPixel * w , genericColorSpace, a);
+        wxASSERT_MSG( bmCtx , wxT("Unable to create bitmap context") ) ;
+
+        CGContextSetFillColorSpace(bmCtx, genericColorSpace); 
+        CGContextSetStrokeColorSpace(bmCtx, genericColorSpace); 
+
+        if( bmCtx )
+        {
+            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_ok = (m_graphicContext != NULL) ;  
+#else
+        if ( ( m_macPort = m_selected.GetHBITMAP( &m_macMask ) ) != NULL )
+        {
+            LockPixels( GetGWorldPixMap(  (CGrafPtr)  m_macPort ) ) ;
+            /*
+            wxMask * mask = bitmap.GetMask() ;
+            if ( mask )
+            {
+                m_macMask = mask->GetHBITMAP() ;
+            }
+            */
+            SetRectRgn( (RgnHandle) m_macBoundaryClipRgn , 0 , 0 , m_selected.GetWidth() , m_selected.GetHeight() ) ;
+            CopyRgn( (RgnHandle) m_macBoundaryClipRgn ,(RgnHandle)  m_macCurrentClipRgn ) ;
+            m_ok = TRUE ;
+        }
+        else
+        {
+            m_ok = FALSE;
+        }
+#endif
+    }
+    else
+    {
+        m_ok = FALSE;
+    }
 }
 
 void wxMemoryDC::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;
+    }
 }