Explicitly forward non-command events along to the native control first.

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

diff --git a/src/mac/carbon/dcmemory.cpp b/src/mac/carbon/dcmemory.cpp
index c085610570690eefe165ba22cf35e454cd489b02..f2519aef95d1f6ed5725203395de2fd30a45ad8e 100644 (file)
--- a/src/mac/carbon/dcmemory.cpp
+++ b/src/mac/carbon/dcmemory.cpp
@@ -1,17 +1,19 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcmemory.cpp
+// Name:        src/mac/carbon/dcmemory.cpp

 // Purpose:     wxMemoryDC class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Purpose:     wxMemoryDC class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #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"
 
 //-----------------------------------------------------------------------------


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

-wxMemoryDC::wxMemoryDC()
-: m_selected()
+void wxMemoryDC::Init()

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


@@ -34,12 +35,7 @@ wxMemoryDC::wxMemoryDC()
 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()


@@ -48,7 +44,7 @@ wxMemoryDC::~wxMemoryDC()
     {
 #if wxMAC_USE_CORE_GRAPHICS
         m_selected.EndRawAccess() ;
     {
 #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 ) ;
         delete m_graphicContext ;
         m_graphicContext = NULL ;
         CGContextRelease( bmCtx ) ;


@@ -58,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() ;
 {
     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 ) ;
         delete m_graphicContext ;
         m_graphicContext = NULL ;
         CGContextRelease( bmCtx ) ;


@@ -77,16 +73,19 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
     if (m_selected.Ok())
     {
 #if wxMAC_USE_CORE_GRAPHICS
     if (m_selected.Ok())
     {
 #if wxMAC_USE_CORE_GRAPHICS

-        m_selected.UseAlpha() ;
+        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() ;
         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] ?
 
         // TODO: should this be kCGImageAlphaPremultiplied[First,Last] ?

-        CGImageAlphaInfo a = kCGImageAlphaNoneSkipFirst ; 
+        CGImageAlphaInfo a = kCGImageAlphaNoneSkipFirst ;

 
         CGColorSpaceRef genericColorSpace  = wxMacGetGenericRGBColorSpace();
         CGContextRef bmCtx = CGBitmapContextCreate( data , w, h, bitsPerComp , bytesPerPixel * w , genericColorSpace, a );
 
         CGColorSpaceRef genericColorSpace  = wxMacGetGenericRGBColorSpace();
         CGContextRef bmCtx = CGBitmapContextCreate( data , w, h, bitsPerComp , bytesPerPixel * w , genericColorSpace, a );


@@ -94,15 +93,16 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
 
         if ( bmCtx )
         {
 
         if ( bmCtx )
         {

-            CGContextSetFillColorSpace( bmCtx, genericColorSpace ); 
-            CGContextSetStrokeColorSpace( bmCtx, genericColorSpace ); 
+            CGContextSetFillColorSpace( bmCtx, genericColorSpace );
+            CGContextSetStrokeColorSpace( bmCtx, genericColorSpace );

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

-            m_graphicContext = new wxMacCGContext( bmCtx ) ;  
+                       SetGraphicsContext( wxGraphicsContext::CreateFromNative( bmCtx ) );

             m_graphicContext->SetPen( m_pen ) ;
             m_graphicContext->SetPen( m_pen ) ;

-            m_graphicContext->SetBrush( m_brush ) ;     
+            m_graphicContext->SetBrush( m_brush ) ;
+            m_graphicContext->SetFont( m_font , m_textForegroundColour) ;

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