Added automatic dialog scrolling ability

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

diff --git a/src/mac/carbon/graphics.cpp b/src/mac/carbon/graphics.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 295b0b1..616c5d4
--- a/src/mac/carbon/graphics.cpp
+++ b/src/mac/carbon/graphics.cpp
@@ -11,14 +11,16 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

-#if wxUSE_GRAPHICS_CONTEXT && wxMAC_USE_CORE_GRAPHICS
-

 #include "wx/graphics.h"
 #include "wx/graphics.h"

+#include "wx/private/graphics.h"

 
 #ifndef WX_PRECOMP
     #include "wx/dcclient.h"
 
 #ifndef WX_PRECOMP
     #include "wx/dcclient.h"

+    #include "wx/dcmemory.h"

     #include "wx/log.h"
     #include "wx/region.h"
     #include "wx/log.h"
     #include "wx/region.h"

+    #include "wx/image.h"
+    #include "wx/icon.h"

 #endif
 
 #include "wx/mac/uma.h"
 #endif
 
 #include "wx/mac/uma.h"


@@ -34,10 +36,6 @@
 
 #include "wx/mac/private.h"
 
 
 #include "wx/mac/private.h"
 

-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4
-typedef float CGFloat;
-#endif
-

 //-----------------------------------------------------------------------------
 // constants
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // constants
 //-----------------------------------------------------------------------------


@@ -57,6 +55,20 @@ static const double RAD2DEG = 180.0 / M_PI;
 #pragma mark -
 #pragma mark wxMacCoreGraphicsPattern, ImagePattern, HatchPattern classes
 
 #pragma mark -
 #pragma mark wxMacCoreGraphicsPattern, ImagePattern, HatchPattern classes
 

+OSStatus wxMacDrawCGImage(
+                  CGContextRef    inContext,
+                  const HIRect *  inBounds,
+                  CGImageRef      inImage) 
+{
+#ifdef __LP64__
+    // todo flip
+    CGContextDrawImage(inContext, *inBounds, inImage );
+    return noErr;
+#else
+    return HIViewDrawCGImage( inContext, inBounds, inImage );
+#endif
+}
+

 // CGPattern wrapper class: always allocate on heap, never call destructor
 
 class wxMacCoreGraphicsPattern
 // CGPattern wrapper class: always allocate on heap, never call destructor
 
 class wxMacCoreGraphicsPattern


@@ -103,7 +115,7 @@ public :
     {
         wxASSERT( bmp && bmp->Ok() );
 
     {
         wxASSERT( bmp && bmp->Ok() );
 

-        Init( (CGImageRef) bmp->CGImageCreate() , transform );
+        Init( (CGImageRef) bmp->CreateCGImage() , transform );

     }
 
     // ImagePattern takes ownership of CGImageRef passed in
     }
 
     // ImagePattern takes ownership of CGImageRef passed in


@@ -118,7 +130,7 @@ public :
     virtual void Render( CGContextRef ctxRef )
     {
         if (m_image != NULL)
     virtual void Render( CGContextRef ctxRef )
     {
         if (m_image != NULL)

-            HIViewDrawCGImage( ctxRef, &m_imageBounds, m_image );
+            wxMacDrawCGImage( ctxRef, &m_imageBounds, m_image );

     }
 
 protected :
     }
 
 protected :


@@ -160,22 +172,7 @@ public :
 
     void StrokeLineSegments( CGContextRef ctxRef , const CGPoint pts[] , size_t count )
     {
 
     void StrokeLineSegments( CGContextRef ctxRef , const CGPoint pts[] , size_t count )
     {

-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
-        if ( UMAGetSystemVersion() >= 0x1040 )
-        {
-            CGContextStrokeLineSegments( ctxRef , pts , count );
-        }
-        else
-#endif
-        {
-            CGContextBeginPath( ctxRef );
-            for (size_t i = 0; i < count; i += 2)
-            {
-                CGContextMoveToPoint(ctxRef, pts[i].x, pts[i].y);
-                CGContextAddLineToPoint(ctxRef, pts[i+1].x, pts[i+1].y);
-            }
-            CGContextStrokePath(ctxRef);
-        }
+        CGContextStrokeLineSegments( ctxRef , pts , count );

     }
 
     virtual void Render( CGContextRef ctxRef )
     }
 
     virtual void Render( CGContextRef ctxRef )


@@ -256,52 +253,40 @@ protected :
     int         m_hatch;
 };
 
     int         m_hatch;
 };
 

-class wxMacCoreGraphicsPen : public wxGraphicsPen
+class wxMacCoreGraphicsPenData : public wxGraphicsObjectRefData

 {
 public:
 {
 public:

-    wxMacCoreGraphicsPen();
-    wxMacCoreGraphicsPen( wxGraphicsRenderer* renderer, const wxPen &pen );
-    ~wxMacCoreGraphicsPen();
-    
+    wxMacCoreGraphicsPenData( wxGraphicsRenderer* renderer, const wxPen &pen );
+    ~wxMacCoreGraphicsPenData();
+

     void Init();
     virtual void Apply( wxGraphicsContext* context );
     virtual wxDouble GetWidth() { return m_width; }
     void Init();
     virtual void Apply( wxGraphicsContext* context );
     virtual wxDouble GetWidth() { return m_width; }

-   
+

 protected :
     CGLineCap m_cap;
 protected :
     CGLineCap m_cap;

-    wxMacCFRefHolder<CGColorRef> m_color;
-    wxMacCFRefHolder<CGColorSpaceRef> m_colorSpace;
+    wxCFRef<CGColorRef> m_color;
+    wxCFRef<CGColorSpaceRef> m_colorSpace;

 
     CGLineJoin m_join;
     CGFloat m_width;
 
     CGLineJoin m_join;
     CGFloat m_width;

-    
+

     int m_count;
     const CGFloat *m_lengths;
     CGFloat *m_userLengths;
 
 
     bool m_isPattern;
     int m_count;
     const CGFloat *m_lengths;
     CGFloat *m_userLengths;
 
 
     bool m_isPattern;

-    wxMacCFRefHolder<CGPatternRef> m_pattern;
+    wxCFRef<CGPatternRef> m_pattern;

     CGFloat* m_patternColorComponents;
     CGFloat* m_patternColorComponents;

-private :
-DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacCoreGraphicsPen)

 };
 
 };
 

-IMPLEMENT_DYNAMIC_CLASS(wxMacCoreGraphicsPen,wxGraphicsPen)
-
-wxMacCoreGraphicsPen::wxMacCoreGraphicsPen() : wxGraphicsPen( NULL )
-{
-    wxLogDebug(wxT("Illegal Constructor called"));
-}
-
-wxMacCoreGraphicsPen::wxMacCoreGraphicsPen( wxGraphicsRenderer* renderer, const wxPen &pen ) :
-    wxGraphicsPen( renderer )
+wxMacCoreGraphicsPenData::wxMacCoreGraphicsPenData( wxGraphicsRenderer* renderer, const wxPen &pen ) :
+    wxGraphicsObjectRefData( renderer )

 {
     Init();
 {
     Init();

-    
-    float components[4] = { pen.GetColour().Red() / 255.0 , pen.GetColour().Green() / 255.0 , 
-            pen.GetColour().Blue() / 255.0 , pen.GetColour().Alpha() / 255.0 } ;
-    m_color.Set( CGColorCreate( wxMacGetGenericRGBColorSpace() , components ) ) ;
+
+    m_color.reset( pen.GetColour().CreateCGColor() ) ;

 
     // TODO: * m_dc->m_scaleX
     m_width = pen.GetWidth();
 
     // TODO: * m_dc->m_scaleX
     m_width = pen.GetWidth();


@@ -404,8 +389,8 @@ wxMacCoreGraphicsPen::wxMacCoreGraphicsPen( wxGraphicsRenderer* renderer, const
                 wxBitmap* bmp = pen.GetStipple();
                 if ( bmp && bmp->Ok() )
                 {
                 wxBitmap* bmp = pen.GetStipple();
                 if ( bmp && bmp->Ok() )
                 {

-                    m_colorSpace.Set( CGColorSpaceCreatePattern( NULL ) );
-                    m_pattern.Set( *( new ImagePattern( bmp , CGAffineTransformMakeTranslation( 0,0 ) ) ) );
+                    m_colorSpace.reset( CGColorSpaceCreatePattern( NULL ) );
+                    m_pattern.reset( (CGPatternRef) *( new ImagePattern( bmp , CGAffineTransformMakeScale( 1,-1 ) ) ) );

                     m_patternColorComponents = new CGFloat[1] ;
                     m_patternColorComponents[0] = 1.0;
                     m_isPattern = true;
                     m_patternColorComponents = new CGFloat[1] ;
                     m_patternColorComponents[0] = 1.0;
                     m_isPattern = true;


@@ -416,8 +401,8 @@ wxMacCoreGraphicsPen::wxMacCoreGraphicsPen( wxGraphicsRenderer* renderer, const
         default :
             {
                 m_isPattern = true;
         default :
             {
                 m_isPattern = true;

-                m_colorSpace.Set( CGColorSpaceCreatePattern( wxMacGetGenericRGBColorSpace() ) );
-                m_pattern.Set( *( new HatchPattern( pen.GetStyle() , CGAffineTransformMakeTranslation( 0,0 ) ) ) );
+                m_colorSpace.reset( CGColorSpaceCreatePattern( wxMacGetGenericRGBColorSpace() ) );
+                m_pattern.reset( (CGPatternRef) *( new HatchPattern( pen.GetStyle() , CGAffineTransformMakeScale( 1,-1 ) ) ) );

                 m_patternColorComponents = new CGFloat[4] ;
                 m_patternColorComponents[0] = pen.GetColour().Red() / 255.0;
                 m_patternColorComponents[1] = pen.GetColour().Green() / 255.0;
                 m_patternColorComponents = new CGFloat[4] ;
                 m_patternColorComponents[0] = pen.GetColour().Red() / 255.0;
                 m_patternColorComponents[1] = pen.GetColour().Green() / 255.0;


@@ -433,23 +418,23 @@ wxMacCoreGraphicsPen::wxMacCoreGraphicsPen( wxGraphicsRenderer* renderer, const
     }
 }
 
     }
 }
 

-wxMacCoreGraphicsPen::~wxMacCoreGraphicsPen()
+wxMacCoreGraphicsPenData::~wxMacCoreGraphicsPenData()

 {
     delete[] m_userLengths;
     delete[] m_patternColorComponents;
 }
 
 {
     delete[] m_userLengths;
     delete[] m_patternColorComponents;
 }
 

-void wxMacCoreGraphicsPen::Init()
+void wxMacCoreGraphicsPenData::Init()

 {
     m_lengths = NULL;
     m_userLengths = NULL;
 {
     m_lengths = NULL;
     m_userLengths = NULL;

-    m_width = NULL;
+    m_width = 0;

     m_count = 0;
     m_patternColorComponents = NULL;
     m_isPattern = false;
 }
 
     m_count = 0;
     m_patternColorComponents = NULL;
     m_isPattern = false;
 }
 

-void wxMacCoreGraphicsPen::Apply( wxGraphicsContext* context )
+void wxMacCoreGraphicsPenData::Apply( wxGraphicsContext* context )

 {
     CGContextRef cg = (CGContextRef) context->GetNativeContext();
     CGContextSetLineWidth( cg , m_width );
 {
     CGContextRef cg = (CGContextRef) context->GetNativeContext();
     CGContextSetLineWidth( cg , m_width );


@@ -460,12 +445,19 @@ void wxMacCoreGraphicsPen::Apply( wxGraphicsContext* context )
 
     if ( m_isPattern )
     {
 
     if ( m_isPattern )
     {

+        CGAffineTransform matrix = CGContextGetCTM( cg );
+        CGContextSetPatternPhase( cg, CGSizeMake(matrix.tx, matrix.ty) );

         CGContextSetStrokeColorSpace( cg , m_colorSpace );
         CGContextSetStrokePattern( cg, m_pattern , m_patternColorComponents );
     }
     else
     {
         CGContextSetStrokeColorSpace( cg , m_colorSpace );
         CGContextSetStrokePattern( cg, m_pattern , m_patternColorComponents );
     }
     else
     {

-        CGContextSetStrokeColorWithColor( cg , m_color );
+        if ( context->GetLogicalFunction() == wxINVERT || context->GetLogicalFunction() == wxXOR )
+        {
+            CGContextSetRGBStrokeColor( cg , 1.0, 1.0 , 1.0, 1.0 );
+        }
+        else
+            CGContextSetStrokeColorWithColor( cg , m_color );

     }
 }
 
     }
 }
 


@@ -473,85 +465,83 @@ void wxMacCoreGraphicsPen::Apply( wxGraphicsContext* context )
 // Brush
 //
 
 // Brush
 //
 

-class wxMacCoreGraphicsBrush : public wxGraphicsBrush
-{
-public:
-    wxMacCoreGraphicsBrush();
-    wxMacCoreGraphicsBrush( wxGraphicsRenderer* renderer );
-    wxMacCoreGraphicsBrush( wxGraphicsRenderer* renderer, const wxBrush &brush );
-    ~wxMacCoreGraphicsBrush ();
-    
-    virtual void Apply( wxGraphicsContext* context );
-    void CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, 
-        const wxColour&c1, const wxColour&c2 );
-    void CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
-    const wxColour &oColor, const wxColour &cColor );
-        
-    virtual bool IsShading() { return m_isShading; }
-    CGShadingRef GetShading() { return m_shading; }
-protected:
-    CGFunctionRef CreateGradientFunction( const wxColour& c1, const wxColour& c2 );
-    static void CalculateShadingValues (void *info, const CGFloat *in, CGFloat *out);
-    virtual void Init();
-    
-    wxMacCFRefHolder<CGColorRef> m_color;
-    wxMacCFRefHolder<CGColorSpaceRef> m_colorSpace;
-
-    bool m_isPattern;
-    wxMacCFRefHolder<CGPatternRef> m_pattern;
-    CGFloat* m_patternColorComponents;
-    
-    bool m_isShading;
-    CGFunctionRef m_gradientFunction;
-    CGShadingRef m_shading;
-    CGFloat *m_gradientComponents;
-private :
-DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacCoreGraphicsBrush)
+static const char *gs_stripedback_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"4 4 2 1",
+". c #F0F0F0",
+"X c #ECECEC",
+/* pixels */
+"....",
+"....",
+"XXXX",
+"XXXX"

 };
 
 };
 

-IMPLEMENT_DYNAMIC_CLASS(wxMacCoreGraphicsBrush,wxGraphicsBrush)
+wxBitmap gs_stripedback_bmp( wxImage( (const char* const* ) gs_stripedback_xpm  ), -1 ) ;

 
 

-wxMacCoreGraphicsBrush::wxMacCoreGraphicsBrush() : wxGraphicsBrush( NULL )
+// make sure we all use one class for all conversions from wx to native colour
+
+class wxMacCoreGraphicsColour

 {
 {

-    wxLogDebug(wxT("Illegal Constructor called"));
+    public:
+        wxMacCoreGraphicsColour();
+        wxMacCoreGraphicsColour(const wxBrush &brush);
+        ~wxMacCoreGraphicsColour();
+        
+        void Apply( CGContextRef cgContext );
+    protected:
+        void Init();
+        wxCFRef<CGColorRef> m_color;
+        wxCFRef<CGColorSpaceRef> m_colorSpace;
+        
+        bool m_isPattern;
+        wxCFRef<CGPatternRef> m_pattern;
+        CGFloat* m_patternColorComponents;
+} ;
+
+wxMacCoreGraphicsColour::~wxMacCoreGraphicsColour()
+{
+    delete[] m_patternColorComponents;

 }
 
 }
 

-wxMacCoreGraphicsBrush::wxMacCoreGraphicsBrush( wxGraphicsRenderer* renderer) : wxGraphicsBrush( renderer )
+void wxMacCoreGraphicsColour::Init()

 {
 {

-    Init();
+    m_isPattern = false;
+    m_patternColorComponents = NULL;

 }
 
 }
 

-void wxMacCoreGraphicsBrush::CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, 
-        const wxColour&c1, const wxColour&c2 )
+void wxMacCoreGraphicsColour::Apply( CGContextRef cgContext )

 {
 {

-    m_gradientFunction = CreateGradientFunction( c1, c2 );
-    m_shading = CGShadingCreateAxial( wxMacGetGenericRGBColorSpace(), CGPointMake(x1,y1), CGPointMake(x2,y2), m_gradientFunction, true, true ) ;
-    m_isShading = true ;
+    if ( m_isPattern )
+    {
+        CGAffineTransform matrix = CGContextGetCTM( cgContext );
+        CGContextSetPatternPhase( cgContext, CGSizeMake(matrix.tx, matrix.ty) );
+        CGContextSetFillColorSpace( cgContext , m_colorSpace );
+        CGContextSetFillPattern( cgContext, m_pattern , m_patternColorComponents );
+    }
+    else
+    {
+        CGContextSetFillColorWithColor( cgContext, m_color );
+    }

 }
 }

-        
-void wxMacCoreGraphicsBrush::CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
-    const wxColour &oColor, const wxColour &cColor )
+
+wxMacCoreGraphicsColour::wxMacCoreGraphicsColour() 

 {
 {

-    m_gradientFunction = CreateGradientFunction( oColor, cColor );
-    m_shading = CGShadingCreateRadial( wxMacGetGenericRGBColorSpace(), CGPointMake(xo,yo), 0, CGPointMake(xc,yc), radius, m_gradientFunction, true, true ) ;
-    m_isShading = true ;
+    Init();

 }
 }

-                
-wxMacCoreGraphicsBrush::wxMacCoreGraphicsBrush(wxGraphicsRenderer* renderer, const wxBrush &brush) : wxGraphicsBrush( renderer )
+
+wxMacCoreGraphicsColour::wxMacCoreGraphicsColour( const wxBrush &brush )

 {
     Init();
 {
     Init();

-    

     if ( brush.GetStyle() == wxSOLID )
     {
     if ( brush.GetStyle() == wxSOLID )
     {

-        float components[4] = { brush.GetColour().Red() / 255.0 , brush.GetColour().Green() / 255.0 , 
-                brush.GetColour().Blue() / 255.0 , brush.GetColour().Alpha() / 255.0 } ;
-        m_color.Set( CGColorCreate( wxMacGetGenericRGBColorSpace() , components ) ) ;
+        m_color.reset( brush.GetColour().CreateCGColor() );

     }
     else if ( brush.IsHatch() )
     {
         m_isPattern = true;
     }
     else if ( brush.IsHatch() )
     {
         m_isPattern = true;

-        m_colorSpace.Set( CGColorSpaceCreatePattern( wxMacGetGenericRGBColorSpace() ) );
-        m_pattern.Set( *( new HatchPattern( brush.GetStyle() , CGAffineTransformMakeTranslation( 0,0 ) ) ) );
+        m_colorSpace.reset( CGColorSpaceCreatePattern( wxMacGetGenericRGBColorSpace() ) );
+        m_pattern.reset( (CGPatternRef) *( new HatchPattern( brush.GetStyle() , CGAffineTransformMakeScale( 1,-1 ) ) ) );

 
         m_patternColorComponents = new CGFloat[4] ;
         m_patternColorComponents[0] = brush.GetColour().Red() / 255.0;
 
         m_patternColorComponents = new CGFloat[4] ;
         m_patternColorComponents[0] = brush.GetColour().Red() / 255.0;


@@ -565,59 +555,105 @@ wxMacCoreGraphicsBrush::wxMacCoreGraphicsBrush(wxGraphicsRenderer* renderer, con
         wxBitmap* bmp = brush.GetStipple();
         if ( bmp && bmp->Ok() )
         {
         wxBitmap* bmp = brush.GetStipple();
         if ( bmp && bmp->Ok() )
         {

-            m_isPattern = true;    
+            m_isPattern = true;

             m_patternColorComponents = new CGFloat[1] ;
             m_patternColorComponents[0] = 1.0;
             m_patternColorComponents = new CGFloat[1] ;
             m_patternColorComponents[0] = 1.0;

-            m_colorSpace.Set( CGColorSpaceCreatePattern( NULL ) );
-            m_pattern.Set( *( new ImagePattern( bmp , CGAffineTransformMakeTranslation( 0,0 ) ) ) );
+            m_colorSpace.reset( CGColorSpaceCreatePattern( NULL ) );
+            m_pattern.reset( (CGPatternRef) *( new ImagePattern( bmp , CGAffineTransformMakeScale( 1,-1 ) ) ) );

         }
     }
 }
 
         }
     }
 }
 

-wxMacCoreGraphicsBrush::~wxMacCoreGraphicsBrush()
+class wxMacCoreGraphicsBrushData : public wxGraphicsObjectRefData
+{
+public:
+    wxMacCoreGraphicsBrushData( wxGraphicsRenderer* renderer );
+    wxMacCoreGraphicsBrushData( wxGraphicsRenderer* renderer, const wxBrush &brush );
+    ~wxMacCoreGraphicsBrushData ();
+
+    virtual void Apply( wxGraphicsContext* context );
+    void CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2,
+        const wxColour&c1, const wxColour&c2 );
+    void CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
+    const wxColour &oColor, const wxColour &cColor );
+
+    virtual bool IsShading() { return m_isShading; }
+    CGShadingRef GetShading() { return m_shading; }
+protected:
+    CGFunctionRef CreateGradientFunction( const wxColour& c1, const wxColour& c2 );
+    static void CalculateShadingValues (void *info, const CGFloat *in, CGFloat *out);
+    virtual void Init();
+
+    wxMacCoreGraphicsColour m_cgColor;
+
+    bool m_isShading;
+    CGFunctionRef m_gradientFunction;
+    CGShadingRef m_shading;
+    CGFloat *m_gradientComponents;
+};
+
+wxMacCoreGraphicsBrushData::wxMacCoreGraphicsBrushData( wxGraphicsRenderer* renderer) : wxGraphicsObjectRefData( renderer )
+{
+    Init();
+}
+
+void wxMacCoreGraphicsBrushData::CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2,
+        const wxColour&c1, const wxColour&c2 )
+{
+    m_gradientFunction = CreateGradientFunction( c1, c2 );
+    m_shading = CGShadingCreateAxial( wxMacGetGenericRGBColorSpace(), CGPointMake(x1,y1), CGPointMake(x2,y2), m_gradientFunction, true, true ) ;
+    m_isShading = true ;
+}
+
+void wxMacCoreGraphicsBrushData::CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
+    const wxColour &oColor, const wxColour &cColor )
+{
+    m_gradientFunction = CreateGradientFunction( oColor, cColor );
+    m_shading = CGShadingCreateRadial( wxMacGetGenericRGBColorSpace(), CGPointMake(xo,yo), 0, CGPointMake(xc,yc), radius, m_gradientFunction, true, true ) ;
+    m_isShading = true ;
+}
+
+wxMacCoreGraphicsBrushData::wxMacCoreGraphicsBrushData(wxGraphicsRenderer* renderer, const wxBrush &brush) : wxGraphicsObjectRefData( renderer ),
+    m_cgColor( brush )
+{
+    Init();
+
+}
+
+wxMacCoreGraphicsBrushData::~wxMacCoreGraphicsBrushData()

 {
     if ( m_shading )
         CGShadingRelease(m_shading);
 {
     if ( m_shading )
         CGShadingRelease(m_shading);

-        
+

     if( m_gradientFunction )
         CGFunctionRelease(m_gradientFunction);
     if( m_gradientFunction )
         CGFunctionRelease(m_gradientFunction);

-        
+

     delete[] m_gradientComponents;
     delete[] m_gradientComponents;

-    delete[] m_patternColorComponents;

 }
 
 }
 

-void wxMacCoreGraphicsBrush::Init()
+void wxMacCoreGraphicsBrushData::Init()

 {
 {

-    m_patternColorComponents = NULL;

     m_gradientFunction = NULL;
     m_shading = NULL;
     m_gradientFunction = NULL;
     m_shading = NULL;

-    m_isPattern = false;

     m_gradientComponents = NULL;
     m_isShading = false;
 }
 
     m_gradientComponents = NULL;
     m_isShading = false;
 }
 

-void wxMacCoreGraphicsBrush::Apply( wxGraphicsContext* context )
+void wxMacCoreGraphicsBrushData::Apply( wxGraphicsContext* context )

 {
     CGContextRef cg = (CGContextRef) context->GetNativeContext();
 {
     CGContextRef cg = (CGContextRef) context->GetNativeContext();

-    
+

     if ( m_isShading )
     if ( m_isShading )

-    {   
+    {
+        // nothing to set as shades are processed by clipping using the path and filling

     }
     else
     {
     }
     else
     {

-        if ( m_isPattern )
-        {
-            CGContextSetFillColorSpace( cg , m_colorSpace );
-            CGContextSetFillPattern( cg, m_pattern , m_patternColorComponents );
-        }
-        else
-        {
-            CGContextSetFillColorWithColor( cg, m_color );
-        }
+        m_cgColor.Apply( cg );

     }
 }
 
     }
 }
 

-void wxMacCoreGraphicsBrush::CalculateShadingValues (void *info, const CGFloat *in, CGFloat *out)
+void wxMacCoreGraphicsBrushData::CalculateShadingValues (void *info, const CGFloat *in, CGFloat *out)

 {
     CGFloat* colors = (CGFloat*) info ;
     CGFloat f = *in;
 {
     CGFloat* colors = (CGFloat*) info ;
     CGFloat f = *in;


@@ -627,7 +663,7 @@ void wxMacCoreGraphicsBrush::CalculateShadingValues (void *info, const CGFloat *
     }
 }
 
     }
 }
 

-CGFunctionRef wxMacCoreGraphicsBrush::CreateGradientFunction( const wxColour& c1, const wxColour& c2 )
+CGFunctionRef wxMacCoreGraphicsBrushData::CreateGradientFunction( const wxColour& c1, const wxColour& c2 )

 {
     static const CGFunctionCallbacks callbacks = { 0, &CalculateShadingValues, NULL };
     static const CGFloat input_value_range [2] = { 0, 1 };
 {
     static const CGFunctionCallbacks callbacks = { 0, &CalculateShadingValues, NULL };
     static const CGFloat input_value_range [2] = { 0, 1 };


@@ -642,43 +678,54 @@ CGFunctionRef wxMacCoreGraphicsBrush::CreateGradientFunction( const wxColour& c1
     m_gradientComponents[6] = c2.Blue() / 255.0;
     m_gradientComponents[7] = c2.Alpha() / 255.0;
 
     m_gradientComponents[6] = c2.Blue() / 255.0;
     m_gradientComponents[7] = c2.Alpha() / 255.0;
 

-    return CGFunctionCreate ( m_gradientComponents,  1, 
-                            input_value_range, 
-                            4, 
+    return CGFunctionCreate ( m_gradientComponents,  1,
+                            input_value_range,
+                            4,

                             output_value_ranges,
                             output_value_ranges,

-                            &callbacks);  
+                            &callbacks);

 }
 
 //
 // Font
 //
 
 }
 
 //
 // Font
 //
 

-class wxMacCoreGraphicsFont : public wxGraphicsFont
+class wxMacCoreGraphicsFontData : public wxGraphicsObjectRefData

 {
 public:
 {
 public:

-    wxMacCoreGraphicsFont();
-    wxMacCoreGraphicsFont( wxGraphicsRenderer* renderer, const wxFont &font, const wxColour& col );
-    ~wxMacCoreGraphicsFont();
-    
-    virtual void Apply( wxGraphicsContext* context );
+    wxMacCoreGraphicsFontData( wxGraphicsRenderer* renderer, const wxFont &font, const wxColour& col );
+    ~wxMacCoreGraphicsFontData();
+
+#if wxMAC_USE_ATSU_TEXT

     virtual ATSUStyle GetATSUStyle() { return m_macATSUIStyle; }
     virtual ATSUStyle GetATSUStyle() { return m_macATSUIStyle; }

+#endif
+#if wxMAC_USE_CORE_TEXT
+    CTFontRef GetCTFont() const { return m_ctFont ; }
+#endif
+    wxColour GetColour() const { return m_colour ; }
+    
+    bool GetUnderlined() const { return m_underlined ; }

 private :
 private :

+    wxColour m_colour;
+    bool m_underlined;
+#if wxMAC_USE_ATSU_TEXT

     ATSUStyle m_macATSUIStyle;
     ATSUStyle m_macATSUIStyle;

-DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacCoreGraphicsFont)
+#endif
+#if wxMAC_USE_CORE_TEXT
+    wxCFRef< CTFontRef > m_ctFont;
+#endif

 };
 
 };
 

-IMPLEMENT_DYNAMIC_CLASS(wxMacCoreGraphicsFont,wxGraphicsFont)
-
-wxMacCoreGraphicsFont::wxMacCoreGraphicsFont() : wxGraphicsFont( NULL )
+wxMacCoreGraphicsFontData::wxMacCoreGraphicsFontData(wxGraphicsRenderer* renderer, const wxFont &font, const wxColour& col) : wxGraphicsObjectRefData( renderer )

 {
 {

-    wxLogDebug(wxT("Illegal Constructor called"));
-}
+    m_colour = col;
+    m_underlined = font.GetUnderlined();

 
 

-wxMacCoreGraphicsFont::wxMacCoreGraphicsFont(wxGraphicsRenderer* renderer, const wxFont &font, const wxColour& col) : wxGraphicsFont( renderer )
-{
+#if wxMAC_USE_CORE_TEXT
+    m_ctFont.reset( wxCFRetain((CTFontRef) font.MacGetCTFont()) );
+#endif
+#if wxMAC_USE_ATSU_TEXT
+    OSStatus status = noErr;

     m_macATSUIStyle = NULL;
     m_macATSUIStyle = NULL;

-    
-    OSStatus status;

 
     status = ATSUCreateAndCopyStyle( (ATSUStyle) font.MacGetATSUStyle() , &m_macATSUIStyle );
 
 
     status = ATSUCreateAndCopyStyle( (ATSUStyle) font.MacGetATSUStyle() , &m_macATSUIStyle );
 


@@ -687,7 +734,8 @@ wxMacCoreGraphicsFont::wxMacCoreGraphicsFont(wxGraphicsRenderer* renderer, const
     // we need the scale here ...
 
     Fixed atsuSize = IntToFixed( int( 1 * font.MacGetFontSize()) );
     // we need the scale here ...
 
     Fixed atsuSize = IntToFixed( int( 1 * font.MacGetFontSize()) );

-    RGBColor atsuColor = MAC_WXCOLORREF( col.GetPixel() );
+    RGBColor atsuColor ;
+    col.GetRGBColor( &atsuColor );

     ATSUAttributeTag atsuTags[] =
     {
             kATSUSizeTag ,
     ATSUAttributeTag atsuTags[] =
     {
             kATSUSizeTag ,


@@ -709,20 +757,24 @@ wxMacCoreGraphicsFont::wxMacCoreGraphicsFont(wxGraphicsRenderer* renderer, const
         atsuTags, atsuSizes, atsuValues);
 
     wxASSERT_MSG( status == noErr , wxT("couldn't modify ATSU style") );
         atsuTags, atsuSizes, atsuValues);
 
     wxASSERT_MSG( status == noErr , wxT("couldn't modify ATSU style") );

+#endif
+#if wxMAC_USE_CG_TEXT
+#endif

 }
 
 }
 

-wxMacCoreGraphicsFont::~wxMacCoreGraphicsFont()
+wxMacCoreGraphicsFontData::~wxMacCoreGraphicsFontData()

 {
 {

+#if wxMAC_USE_CORE_TEXT
+#endif
+#if wxMAC_USE_ATSU_TEXT

     if ( m_macATSUIStyle )
     {
         ::ATSUDisposeStyle((ATSUStyle)m_macATSUIStyle);
         m_macATSUIStyle = NULL;
     }
     if ( m_macATSUIStyle )
     {
         ::ATSUDisposeStyle((ATSUStyle)m_macATSUIStyle);
         m_macATSUIStyle = NULL;
     }

-}
-
-void wxMacCoreGraphicsFont::Apply( wxGraphicsContext* WXUNUSED(context) )
-{
-    // nothing to do here
+#endif
+#if wxMAC_USE_CG_TEXT
+#endif

 }
 
 //
 }
 
 //


@@ -733,41 +785,39 @@ void wxMacCoreGraphicsFont::Apply( wxGraphicsContext* WXUNUSED(context) )
 // wxMacCoreGraphicsMatrix declaration
 //-----------------------------------------------------------------------------
 
 // wxMacCoreGraphicsMatrix declaration
 //-----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxMacCoreGraphicsMatrix : public wxGraphicsMatrix
+class WXDLLIMPEXP_CORE wxMacCoreGraphicsMatrixData : public wxGraphicsMatrixData

 {
 public :
 {
 public :

-    wxMacCoreGraphicsMatrix() ;
-    
-       wxMacCoreGraphicsMatrix(wxGraphicsRenderer* renderer, wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0, 
-               wxDouble tx=0.0, wxDouble ty=0.0) ;
-       
-       virtual ~wxMacCoreGraphicsMatrix() ;
-       
-    virtual wxGraphicsMatrix *Clone() const ;
-
-       // concatenates the matrix
-       virtual void Concat( const wxGraphicsMatrix *t );
-       
-       // copies the passed in matrix
-       virtual void Copy( const wxGraphicsMatrix *t );
-
-       // sets the matrix to the respective values
-       virtual void Set(wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0, 
-               wxDouble tx=0.0, wxDouble ty=0.0);
-
-       // makes this the inverse matrix
-       virtual void Invert();
-       
-       // returns true if the elements of the transformation matrix are equal ?
-    virtual bool IsEqual( const wxGraphicsMatrix* t) const ;
-       
-       // return true if this is the identity matrix
-       virtual bool IsIdentity();
-       
+    wxMacCoreGraphicsMatrixData(wxGraphicsRenderer* renderer) ;
+
+    virtual ~wxMacCoreGraphicsMatrixData() ;
+
+    virtual wxGraphicsObjectRefData *Clone() const ;
+
+    // concatenates the matrix
+    virtual void Concat( const wxGraphicsMatrixData *t );
+
+    // sets the matrix to the respective values
+    virtual void Set(wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0,
+        wxDouble tx=0.0, wxDouble ty=0.0);
+
+    // gets the component valuess of the matrix
+    virtual void Get(wxDouble* a=NULL, wxDouble* b=NULL,  wxDouble* c=NULL,
+                     wxDouble* d=NULL, wxDouble* tx=NULL, wxDouble* ty=NULL) const;
+       
+    // makes this the inverse matrix
+    virtual void Invert();
+
+    // returns true if the elements of the transformation matrix are equal ?
+    virtual bool IsEqual( const wxGraphicsMatrixData* t) const ;
+
+    // return true if this is the identity matrix
+    virtual bool IsIdentity() const;
+

     //
     // transformation
     //
     //
     // transformation
     //

-    
+

     // add the translation to this matrix
     virtual void Translate( wxDouble dx , wxDouble dy );
 
     // add the translation to this matrix
     virtual void Translate( wxDouble dx , wxDouble dy );
 


@@ -775,90 +825,86 @@ public :
     virtual void Scale( wxDouble xScale , wxDouble yScale );
 
     // add the rotation to this matrix (radians)
     virtual void Scale( wxDouble xScale , wxDouble yScale );
 
     // add the rotation to this matrix (radians)

-    virtual void Rotate( wxDouble angle );     
-       
+    virtual void Rotate( wxDouble angle );
+

     //
     // apply the transforms
     //
     //
     // apply the transforms
     //

-       
-       // applies that matrix to the point
-       virtual void TransformPoint( wxDouble *x, wxDouble *y );
-       
-       // applies the matrix except for translations
-       virtual void TransformDistance( wxDouble *dx, wxDouble *dy );
-       
-       // returns the native representation
-       virtual void * GetNativeMatrix() const;
-       
+
+    // applies that matrix to the point
+    virtual void TransformPoint( wxDouble *x, wxDouble *y ) const;
+
+    // applies the matrix except for translations
+    virtual void TransformDistance( wxDouble *dx, wxDouble *dy ) const;
+
+    // returns the native representation
+    virtual void * GetNativeMatrix() const;
+

 private :
     CGAffineTransform m_matrix;
 private :
     CGAffineTransform m_matrix;

-    
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacCoreGraphicsMatrix)

 } ;
 
 //-----------------------------------------------------------------------------
 // wxMacCoreGraphicsMatrix implementation
 //-----------------------------------------------------------------------------
 
 } ;
 
 //-----------------------------------------------------------------------------
 // wxMacCoreGraphicsMatrix implementation
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxMacCoreGraphicsMatrix, wxGraphicsMatrix)
-
-wxMacCoreGraphicsMatrix::wxMacCoreGraphicsMatrix() : wxGraphicsMatrix(NULL)
-{
-    wxLogDebug(wxT("Illegal Constructor called"));
-}
-
-wxMacCoreGraphicsMatrix::wxMacCoreGraphicsMatrix(wxGraphicsRenderer* renderer, wxDouble a, wxDouble b, wxDouble c, wxDouble d, 
-    wxDouble tx, wxDouble ty) : wxGraphicsMatrix(renderer)
+wxMacCoreGraphicsMatrixData::wxMacCoreGraphicsMatrixData(wxGraphicsRenderer* renderer) : wxGraphicsMatrixData(renderer)

 {
 {

-    m_matrix = CGAffineTransformMake(a,b,c,d,tx,ty);

 }
 
 }
 

-wxMacCoreGraphicsMatrix::~wxMacCoreGraphicsMatrix() 
+wxMacCoreGraphicsMatrixData::~wxMacCoreGraphicsMatrixData()

 {
 }
 
 {
 }
 

-wxGraphicsMatrix *wxMacCoreGraphicsMatrix::Clone() const 
+wxGraphicsObjectRefData *wxMacCoreGraphicsMatrixData::Clone() const

 {
 {

-    wxMacCoreGraphicsMatrix* m = new wxMacCoreGraphicsMatrix(GetRenderer()) ;
+    wxMacCoreGraphicsMatrixData* m = new wxMacCoreGraphicsMatrixData(GetRenderer()) ;

     m->m_matrix = m_matrix ;
     return m;
 }
 
 // concatenates the matrix
     m->m_matrix = m_matrix ;
     return m;
 }
 
 // concatenates the matrix

-void wxMacCoreGraphicsMatrix::Concat( const wxGraphicsMatrix *t ) 
+void wxMacCoreGraphicsMatrixData::Concat( const wxGraphicsMatrixData *t )

 {
     m_matrix = CGAffineTransformConcat(m_matrix, *((CGAffineTransform*) t->GetNativeMatrix()) );
 }
 
 {
     m_matrix = CGAffineTransformConcat(m_matrix, *((CGAffineTransform*) t->GetNativeMatrix()) );
 }
 

-// copies the passed in matrix
-void wxMacCoreGraphicsMatrix::Copy( const wxGraphicsMatrix *t ) 
+// sets the matrix to the respective values
+void wxMacCoreGraphicsMatrixData::Set(wxDouble a, wxDouble b, wxDouble c, wxDouble d,
+    wxDouble tx, wxDouble ty)

 {
 {

-    m_matrix = *((CGAffineTransform*) t->GetNativeMatrix());
+    m_matrix = CGAffineTransformMake(a,b,c,d,tx,ty);

 }
 
 }
 

-// sets the matrix to the respective values
-void wxMacCoreGraphicsMatrix::Set(wxDouble a, wxDouble b, wxDouble c, wxDouble d, 
-    wxDouble tx, wxDouble ty) 
+// gets the component valuess of the matrix
+void wxMacCoreGraphicsMatrixData::Get(wxDouble* a, wxDouble* b,  wxDouble* c,
+                                      wxDouble* d, wxDouble* tx, wxDouble* ty) const

 {
 {

-    m_matrix = CGAffineTransformMake(a,b,c,d,tx,ty);
+    if (a)  *a = m_matrix.a;
+    if (b)  *b = m_matrix.b;
+    if (c)  *c = m_matrix.c;
+    if (d)  *d = m_matrix.d;
+    if (tx) *tx= m_matrix.tx;
+    if (ty) *ty= m_matrix.ty;

 }
 
 // makes this the inverse matrix
 }
 
 // makes this the inverse matrix

-void wxMacCoreGraphicsMatrix::Invert() 
+void wxMacCoreGraphicsMatrixData::Invert()

 {
     m_matrix = CGAffineTransformInvert( m_matrix );
 }
 
 // returns true if the elements of the transformation matrix are equal ?
 {
     m_matrix = CGAffineTransformInvert( m_matrix );
 }
 
 // returns true if the elements of the transformation matrix are equal ?

-bool wxMacCoreGraphicsMatrix::IsEqual( const wxGraphicsMatrix* t) const  
+bool wxMacCoreGraphicsMatrixData::IsEqual( const wxGraphicsMatrixData* t) const

 {
     return CGAffineTransformEqualToTransform(m_matrix, *((CGAffineTransform*) t->GetNativeMatrix()));
 }
 
 // return true if this is the identity matrix
 {
     return CGAffineTransformEqualToTransform(m_matrix, *((CGAffineTransform*) t->GetNativeMatrix()));
 }
 
 // return true if this is the identity matrix

-bool wxMacCoreGraphicsMatrix::IsIdentity() 
+bool wxMacCoreGraphicsMatrixData::IsIdentity() const

 {
 {

-    return CGAffineTransformIsIdentity(m_matrix);
+    return ( m_matrix.a == 1 && m_matrix.d == 1 &&
+        m_matrix.b == 0 && m_matrix.d == 0 && m_matrix.tx == 0 && m_matrix.ty == 0);

 }
 
 //
 }
 
 //


@@ -866,19 +912,19 @@ bool wxMacCoreGraphicsMatrix::IsIdentity()
 //
 
 // add the translation to this matrix
 //
 
 // add the translation to this matrix

-void wxMacCoreGraphicsMatrix::Translate( wxDouble dx , wxDouble dy ) 
+void wxMacCoreGraphicsMatrixData::Translate( wxDouble dx , wxDouble dy )

 {
     m_matrix = CGAffineTransformTranslate( m_matrix, dx, dy);
 }
 
 // add the scale to this matrix
 {
     m_matrix = CGAffineTransformTranslate( m_matrix, dx, dy);
 }
 
 // add the scale to this matrix

-void wxMacCoreGraphicsMatrix::Scale( wxDouble xScale , wxDouble yScale ) 
+void wxMacCoreGraphicsMatrixData::Scale( wxDouble xScale , wxDouble yScale )

 {
     m_matrix = CGAffineTransformScale( m_matrix, xScale, yScale);
 }
 
 // add the rotation to this matrix (radians)
 {
     m_matrix = CGAffineTransformScale( m_matrix, xScale, yScale);
 }
 
 // add the rotation to this matrix (radians)

-void wxMacCoreGraphicsMatrix::Rotate( wxDouble angle ) 
+void wxMacCoreGraphicsMatrixData::Rotate( wxDouble angle )

 {
     m_matrix = CGAffineTransformRotate( m_matrix, angle);
 }
 {
     m_matrix = CGAffineTransformRotate( m_matrix, angle);
 }


@@ -888,31 +934,24 @@ void wxMacCoreGraphicsMatrix::Rotate( wxDouble angle )
 //
 
 // applies that matrix to the point
 //
 
 // applies that matrix to the point

-void wxMacCoreGraphicsMatrix::TransformPoint( wxDouble *x, wxDouble *y ) 
+void wxMacCoreGraphicsMatrixData::TransformPoint( wxDouble *x, wxDouble *y ) const

 {
 {

-    wxDouble x1, y1 ;
-    
-    x1 = m_matrix.a * (*x) + m_matrix.c * (*y) + m_matrix.tx ;
-    y1 = m_matrix.b * (*x) + m_matrix.d * (*y) + m_matrix.ty ;
-    
-    *x = x1;
-    *y = y1;
+    CGPoint pt = CGPointApplyAffineTransform( CGPointMake(*x,*y), m_matrix);
+
+    *x = pt.x;
+    *y = pt.y;

 }
 
 // applies the matrix except for translations
 }
 
 // applies the matrix except for translations

-void wxMacCoreGraphicsMatrix::TransformDistance( wxDouble *dx, wxDouble *dy ) 
+void wxMacCoreGraphicsMatrixData::TransformDistance( wxDouble *dx, wxDouble *dy ) const

 {
 {

-    wxDouble x1, y1 ;
-    
-    x1 = m_matrix.a * (*dx) + m_matrix.c * (*dy);
-    y1 = m_matrix.b * (*dx) + m_matrix.d * (*dy);
-    
-    *dx = x1;
-    *dy = y1;
+    CGSize sz = CGSizeApplyAffineTransform( CGSizeMake(*dx,*dy) , m_matrix );
+    *dx = sz.width;
+    *dy = sz.height;

 }
 
 // returns the native representation
 }
 
 // returns the native representation

-void * wxMacCoreGraphicsMatrix::GetNativeMatrix() const 
+void * wxMacCoreGraphicsMatrixData::GetNativeMatrix() const

 {
     return (void*) &m_matrix;
 }
 {
     return (void*) &m_matrix;
 }


@@ -925,21 +964,19 @@ void * wxMacCoreGraphicsMatrix::GetNativeMatrix() const
 // wxMacCoreGraphicsPath declaration
 //-----------------------------------------------------------------------------
 
 // wxMacCoreGraphicsPath declaration
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxMacCoreGraphicsPath : public wxGraphicsPath
+class WXDLLEXPORT wxMacCoreGraphicsPathData : public wxGraphicsPathData

 {
 public :
 {
 public :

-    wxMacCoreGraphicsPath( wxGraphicsRenderer* renderer, CGMutablePathRef path = NULL);
-    
-    wxMacCoreGraphicsPath();
-    
-    ~wxMacCoreGraphicsPath();
+    wxMacCoreGraphicsPathData( wxGraphicsRenderer* renderer, CGMutablePathRef path = NULL);

 
 

-    virtual wxGraphicsPath *Clone() const;
+    ~wxMacCoreGraphicsPathData();
+
+    virtual wxGraphicsObjectRefData *Clone() const;

 
     // begins a new subpath at (x,y)
     virtual void MoveToPoint( wxDouble x, wxDouble y );
 
 
     // begins a new subpath at (x,y)
     virtual void MoveToPoint( wxDouble x, wxDouble y );
 

-    // adds a straight line from the current point to (x,y) 
+    // adds a straight line from the current point to (x,y)

     virtual void AddLineToPoint( wxDouble x, wxDouble y );
 
     // adds a cubic Bezier curve from the current point, using two control points and an end point
     virtual void AddLineToPoint( wxDouble x, wxDouble y );
 
     // adds a cubic Bezier curve from the current point, using two control points and an end point


@@ -949,20 +986,20 @@ public :
     virtual void CloseSubpath();
 
     // gets the last point of the current path, (0,0) if not yet set
     virtual void CloseSubpath();
 
     // gets the last point of the current path, (0,0) if not yet set

-    virtual void GetCurrentPoint( wxDouble& x, wxDouble&y);
+    virtual void GetCurrentPoint( wxDouble* x, wxDouble* y) const;

 
     // adds an arc of a circle centering at (x,y) with radius (r) from startAngle to endAngle
     virtual void AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise );
 
     //
 
     // adds an arc of a circle centering at (x,y) with radius (r) from startAngle to endAngle
     virtual void AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise );
 
     //

-    // These are convenience functions which - if not available natively will be assembled 
+    // These are convenience functions which - if not available natively will be assembled

     // using the primitives from above
     //
 
     // adds a quadratic Bezier curve from the current point, using a control point and an end point
     virtual void AddQuadCurveToPoint( wxDouble cx, wxDouble cy, wxDouble x, wxDouble y );
 
     // using the primitives from above
     //
 
     // adds a quadratic Bezier curve from the current point, using a control point and an end point
     virtual void AddQuadCurveToPoint( wxDouble cx, wxDouble cy, wxDouble x, wxDouble y );
 

-    // appends a rectangle as a new closed subpath 
+    // appends a rectangle as a new closed subpath

     virtual void AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h );
 
     // appends an ellipsis as a new closed subpath fitting the passed rectangle
     virtual void AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h );
 
     // appends an ellipsis as a new closed subpath fitting the passed rectangle


@@ -971,23 +1008,22 @@ public :
     // draws a an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) to (x2,y2), also a straight line from (current) to (x1,y1)
     virtual void AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r );
 
     // draws a an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) to (x2,y2), also a straight line from (current) to (x1,y1)
     virtual void AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r );
 

-       // adds another path
-       virtual void AddPath( const wxGraphicsPath* path );
-
-       // returns the native path
-       virtual void * GetNativePath() const { return m_path; }
-       
-       // give the native path returned by GetNativePath() back (there might be some deallocations necessary)
-       virtual void UnGetNativePath(void *p) {}
-
-       // transforms each point of this path by the matrix
-       virtual void Transform( wxGraphicsMatrix* matrix );
-       
-       // gets the bounding box enclosing all points (possibly including control points)
-       virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *y);
-       
-       virtual bool Contains( wxDouble x, wxDouble y, int fillStyle = wxWINDING_RULE);
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacCoreGraphicsPath)
+    // adds another path
+    virtual void AddPath( const wxGraphicsPathData* path );
+
+    // returns the native path
+    virtual void * GetNativePath() const { return m_path; }
+
+    // give the native path returned by GetNativePath() back (there might be some deallocations necessary)
+    virtual void UnGetNativePath(void *WXUNUSED(p)) const {}
+
+    // transforms each point of this path by the matrix
+    virtual void Transform( const wxGraphicsMatrixData* matrix );
+
+    // gets the bounding box enclosing all points (possibly including control points)
+    virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *y) const;
+
+    virtual bool Contains( wxDouble x, wxDouble y, int fillStyle = wxODDEVEN_RULE) const;

 private :
     CGMutablePathRef m_path;
 };
 private :
     CGMutablePathRef m_path;
 };


@@ -996,131 +1032,113 @@ private :
 // wxMacCoreGraphicsPath implementation
 //-----------------------------------------------------------------------------
 
 // wxMacCoreGraphicsPath implementation
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxMacCoreGraphicsPath, wxGraphicsPath)
-
-wxMacCoreGraphicsPath::wxMacCoreGraphicsPath() :  wxGraphicsPath(NULL)
-{
-    wxLogDebug(wxT("Illegal Constructor called"));
-}    
-
-
-wxMacCoreGraphicsPath::wxMacCoreGraphicsPath( wxGraphicsRenderer* renderer, CGMutablePathRef path) : wxGraphicsPath(renderer)
+wxMacCoreGraphicsPathData::wxMacCoreGraphicsPathData( wxGraphicsRenderer* renderer, CGMutablePathRef path) : wxGraphicsPathData(renderer)

 {
 {

-       if ( path )
-               m_path = path;
-       else
-               m_path = CGPathCreateMutable();
+    if ( path )
+        m_path = path;
+    else
+        m_path = CGPathCreateMutable();

 }
 
 }
 

-wxMacCoreGraphicsPath::~wxMacCoreGraphicsPath()
+wxMacCoreGraphicsPathData::~wxMacCoreGraphicsPathData()

 {
     CGPathRelease( m_path );
 }
 
 {
     CGPathRelease( m_path );
 }
 

-wxGraphicsPath* wxMacCoreGraphicsPath::Clone() const 
+wxGraphicsObjectRefData* wxMacCoreGraphicsPathData::Clone() const

 {
 {

-       wxMacCoreGraphicsPath* clone = new wxMacCoreGraphicsPath(GetRenderer(),CGPathCreateMutableCopy(m_path));
-       return clone ;
+    wxMacCoreGraphicsPathData* clone = new wxMacCoreGraphicsPathData(GetRenderer(),CGPathCreateMutableCopy(m_path));
+    return clone ;

 }
 
 
 // opens (starts) a new subpath
 }
 
 
 // opens (starts) a new subpath

-void wxMacCoreGraphicsPath::MoveToPoint( wxDouble x1 , wxDouble y1 )
+void wxMacCoreGraphicsPathData::MoveToPoint( wxDouble x1 , wxDouble y1 )

 {
     CGPathMoveToPoint( m_path , NULL , x1 , y1 );
 }
 
 {
     CGPathMoveToPoint( m_path , NULL , x1 , y1 );
 }
 

-void wxMacCoreGraphicsPath::AddLineToPoint( wxDouble x1 , wxDouble y1 )
+void wxMacCoreGraphicsPathData::AddLineToPoint( wxDouble x1 , wxDouble y1 )

 {
     CGPathAddLineToPoint( m_path , NULL , x1 , y1 );
 }
 
 {
     CGPathAddLineToPoint( m_path , NULL , x1 , y1 );
 }
 

-void wxMacCoreGraphicsPath::AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y )
+void wxMacCoreGraphicsPathData::AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y )

 {
     CGPathAddCurveToPoint( m_path , NULL , cx1 , cy1 , cx2, cy2, x , y );
 }
 
 {
     CGPathAddCurveToPoint( m_path , NULL , cx1 , cy1 , cx2, cy2, x , y );
 }
 

-void wxMacCoreGraphicsPath::AddQuadCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble x, wxDouble y )
+void wxMacCoreGraphicsPathData::AddQuadCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble x, wxDouble y )

 {
     CGPathAddQuadCurveToPoint( m_path , NULL , cx1 , cy1 , x , y );
 }
 
 {
     CGPathAddQuadCurveToPoint( m_path , NULL , cx1 , cy1 , x , y );
 }
 

-void wxMacCoreGraphicsPath::AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h )
+void wxMacCoreGraphicsPathData::AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h )

 {
     CGRect cgRect = { { x , y } , { w , h } };
     CGPathAddRect( m_path , NULL , cgRect );
 }
 
 {
     CGRect cgRect = { { x , y } , { w , h } };
     CGPathAddRect( m_path , NULL , cgRect );
 }
 

-void wxMacCoreGraphicsPath::AddCircle( wxDouble x, wxDouble y , wxDouble r )
+void wxMacCoreGraphicsPathData::AddCircle( wxDouble x, wxDouble y , wxDouble r )

 {
     CGPathAddArc( m_path , NULL , x , y , r , 0.0 , 2 * M_PI , true );
 }
 
 // adds an arc of a circle centering at (x,y) with radius (r) from startAngle to endAngle
 {
     CGPathAddArc( m_path , NULL , x , y , r , 0.0 , 2 * M_PI , true );
 }
 
 // adds an arc of a circle centering at (x,y) with radius (r) from startAngle to endAngle

-void wxMacCoreGraphicsPath::AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise )
+void wxMacCoreGraphicsPathData::AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise )

 {
     // inverse direction as we the 'normal' state is a y axis pointing down, ie mirrored to the standard core graphics setup
 {
     // inverse direction as we the 'normal' state is a y axis pointing down, ie mirrored to the standard core graphics setup

-    CGPathAddArc( m_path, NULL , x, y, r, startAngle, endAngle, !clockwise); 
+    CGPathAddArc( m_path, NULL , x, y, r, startAngle, endAngle, !clockwise);

 }
 
 }
 

-void wxMacCoreGraphicsPath::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r )
+void wxMacCoreGraphicsPathData::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r )

 {
 {

-    CGPathAddArcToPoint( m_path, NULL , x1, y1, x2, y2, r); 
+    CGPathAddArcToPoint( m_path, NULL , x1, y1, x2, y2, r);

 }
 
 }
 

-void wxMacCoreGraphicsPath::AddPath( const wxGraphicsPath* path )
+void wxMacCoreGraphicsPathData::AddPath( const wxGraphicsPathData* path )

 {
 {

-       CGPathAddPath( m_path , NULL, (CGPathRef) path->GetNativePath() );
+    CGPathAddPath( m_path , NULL, (CGPathRef) path->GetNativePath() );

 }
 
 // closes the current subpath
 }
 
 // closes the current subpath

-void wxMacCoreGraphicsPath::CloseSubpath()
+void wxMacCoreGraphicsPathData::CloseSubpath()

 {
     CGPathCloseSubpath( m_path );
 }
 
 // gets the last point of the current path, (0,0) if not yet set
 {
     CGPathCloseSubpath( m_path );
 }
 
 // gets the last point of the current path, (0,0) if not yet set

-void wxMacCoreGraphicsPath::GetCurrentPoint( wxDouble& x, wxDouble&y)
+void wxMacCoreGraphicsPathData::GetCurrentPoint( wxDouble* x, wxDouble* y) const

 {
     CGPoint p = CGPathGetCurrentPoint( m_path );
 {
     CGPoint p = CGPathGetCurrentPoint( m_path );

-    x = p.x;
-    y = p.y;
+    *x = p.x;
+    *y = p.y;

 }
 
 // transforms each point of this path by the matrix
 }
 
 // transforms each point of this path by the matrix

-void wxMacCoreGraphicsPath::Transform( wxGraphicsMatrix* matrix )
+void wxMacCoreGraphicsPathData::Transform( const wxGraphicsMatrixData* matrix )

 {
 {

-       CGMutablePathRef p = CGPathCreateMutable() ;
-       CGPathAddPath( p, (CGAffineTransform*) matrix->GetNativeMatrix() , m_path );
-       CGPathRelease( m_path );
-       m_path = p;
+    CGMutablePathRef p = CGPathCreateMutable() ;
+    CGPathAddPath( p, (CGAffineTransform*) matrix->GetNativeMatrix() , m_path );
+    CGPathRelease( m_path );
+    m_path = p;

 }
 
 // gets the bounding box enclosing all points (possibly including control points)
 }
 
 // gets the bounding box enclosing all points (possibly including control points)

-void wxMacCoreGraphicsPath::GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h)
+void wxMacCoreGraphicsPathData::GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const

 {
 {

-       CGRect bounds = CGPathGetBoundingBox( m_path ) ;
-       *x = bounds.origin.x;
-       *y = bounds.origin.y;
-       *w = bounds.size.width;
-       *h = bounds.size.height;
+    CGRect bounds = CGPathGetBoundingBox( m_path ) ;
+    *x = bounds.origin.x;
+    *y = bounds.origin.y;
+    *w = bounds.size.width;
+    *h = bounds.size.height;

 }
 
 }
 

-bool wxMacCoreGraphicsPath::Contains( wxDouble x, wxDouble y, int fillStyle) 
+bool wxMacCoreGraphicsPathData::Contains( wxDouble x, wxDouble y, int fillStyle) const

 {
 {

-       return CGPathContainsPoint( m_path, NULL, CGPointMake(x,y), fillStyle == wxODDEVEN_RULE );
+    return CGPathContainsPoint( m_path, NULL, CGPointMake(x,y), fillStyle == wxODDEVEN_RULE );

 }
 
 }
 

-
-//
-// Graphics Pen
-//
-
-//-----------------------------------------------------------------------------
-// wxMacCoreGraphicsPen declaration
-//-----------------------------------------------------------------------------
-
-

 //
 // Graphics Context
 //
 //
 // Graphics Context
 //


@@ -1132,19 +1150,28 @@ bool wxMacCoreGraphicsPath::Contains( wxDouble x, wxDouble y, int fillStyle)
 class WXDLLEXPORT wxMacCoreGraphicsContext : public wxGraphicsContext
 {
 public:
 class WXDLLEXPORT wxMacCoreGraphicsContext : public wxGraphicsContext
 {
 public:

-    wxMacCoreGraphicsContext( wxGraphicsRenderer* renderer, CGContextRef cgcontext );
-    
+    wxMacCoreGraphicsContext( wxGraphicsRenderer* renderer, CGContextRef cgcontext, wxDouble width = 0, wxDouble height = 0 );
+

     wxMacCoreGraphicsContext( wxGraphicsRenderer* renderer, WindowRef window );
     wxMacCoreGraphicsContext( wxGraphicsRenderer* renderer, WindowRef window );

-    
+

     wxMacCoreGraphicsContext( wxGraphicsRenderer* renderer, wxWindow* window );
     wxMacCoreGraphicsContext( wxGraphicsRenderer* renderer, wxWindow* window );

-    
+

     wxMacCoreGraphicsContext( wxGraphicsRenderer* renderer);
     wxMacCoreGraphicsContext( wxGraphicsRenderer* renderer);

-    
+

     wxMacCoreGraphicsContext();
     wxMacCoreGraphicsContext();

-    
+

     ~wxMacCoreGraphicsContext();
 
     ~wxMacCoreGraphicsContext();
 

-       void Init();
+    void Init();
+
+    // returns the size of the graphics context in device coordinates
+    virtual void GetSize( wxDouble* width, wxDouble* height);
+
+    virtual void StartPage( wxDouble width, wxDouble height );
+    
+    virtual void EndPage();
+
+    virtual void Flush();

 
     // push the current state of the context, ie the transformation matrix on a stack
     virtual void PushState();
 
     // push the current state of the context, ie the transformation matrix on a stack
     virtual void PushState();


@@ -1157,16 +1184,17 @@ public:
 
     // clips drawings to the rect
     virtual void Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h );
 
     // clips drawings to the rect
     virtual void Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h );

-    
+

     // resets the clipping to original extent
     virtual void ResetClip();
 
     virtual void * GetNativeContext();
     // resets the clipping to original extent
     virtual void ResetClip();
 
     virtual void * GetNativeContext();

-    
+
+    bool SetLogicalFunction( int function );

     //
     // transformation
     //
     //
     // transformation
     //

-    
+

     // translate
     virtual void Translate( wxDouble dx , wxDouble dy );
 
     // translate
     virtual void Translate( wxDouble dx , wxDouble dy );
 


@@ -1176,51 +1204,42 @@ public:
     // rotate (radians)
     virtual void Rotate( wxDouble angle );
 
     // rotate (radians)
     virtual void Rotate( wxDouble angle );
 

-       // concatenates this transform with the current transform of this context
-       virtual void ConcatTransform( const wxGraphicsMatrix* matrix );
+    // concatenates this transform with the current transform of this context
+    virtual void ConcatTransform( const wxGraphicsMatrix& matrix );

 
 

-       // sets the transform of this context
-       virtual void SetTransform( const wxGraphicsMatrix* matrix );
+    // sets the transform of this context
+    virtual void SetTransform( const wxGraphicsMatrix& matrix );

 
 

-       // gets the matrix of this context
-       virtual void GetTransform( wxGraphicsMatrix* matrix );
+    // gets the matrix of this context
+    virtual wxGraphicsMatrix GetTransform() const;

     //
     // setting the paint
     //
     //
     // setting the paint
     //

-    
-    // sets the pen
-    virtual void SetPen( wxGraphicsPen* pen , bool release = true );
-    
-    // sets the brush for filling
-    virtual void SetBrush( wxGraphicsBrush* brush , bool release = true );
-
-    // sets the font
-    virtual void SetFont( wxGraphicsFont* font, bool release = true );

 
     // strokes along a path with the current pen
 
     // strokes along a path with the current pen

-    virtual void StrokePath( const wxGraphicsPath *path );
+    virtual void StrokePath( const wxGraphicsPath &path );

 
     // fills a path with the current brush
 
     // fills a path with the current brush

-    virtual void FillPath( const wxGraphicsPath *path, int fillStyle = wxWINDING_RULE );
+    virtual void FillPath( const wxGraphicsPath &path, int fillStyle = wxODDEVEN_RULE );

 
     // draws a path by first filling and then stroking
 
     // draws a path by first filling and then stroking

-    virtual void DrawPath( const wxGraphicsPath *path, int fillStyle = wxWINDING_RULE );
+    virtual void DrawPath( const wxGraphicsPath &path, int fillStyle = wxODDEVEN_RULE );

 
     virtual bool ShouldOffset() const
 
     virtual bool ShouldOffset() const

-    {
+    {     

         int penwidth = 0 ;
         int penwidth = 0 ;

-        if ( m_pen )
+        if ( !m_pen.IsNull() )

         {
         {

-            penwidth = m_pen->GetWidth();
+            penwidth = (int)((wxMacCoreGraphicsPenData*)m_pen.GetRefData())->GetWidth();

             if ( penwidth == 0 )
                 penwidth = 1;
         }
             if ( penwidth == 0 )
                 penwidth = 1;
         }

-        return ( penwidth % 2 ) == 1; 
+        return ( penwidth % 2 ) == 1;

     }
     //
     // text
     //
     }
     //
     // text
     //

-    
+

     virtual void DrawText( const wxString &str, wxDouble x, wxDouble y );
 
     virtual void DrawText( const wxString &str, wxDouble x, wxDouble y, wxDouble angle );
     virtual void DrawText( const wxString &str, wxDouble x, wxDouble y );
 
     virtual void DrawText( const wxString &str, wxDouble x, wxDouble y, wxDouble angle );


@@ -1239,7 +1258,7 @@ public:
     virtual void DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h );
 
     void SetNativeContext( CGContextRef cg );
     virtual void DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h );
 
     void SetNativeContext( CGContextRef cg );

-        
+

     DECLARE_NO_COPY_CLASS(wxMacCoreGraphicsContext)
     DECLARE_DYNAMIC_CLASS(wxMacCoreGraphicsContext)
 
     DECLARE_NO_COPY_CLASS(wxMacCoreGraphicsContext)
     DECLARE_DYNAMIC_CLASS(wxMacCoreGraphicsContext)
 


@@ -1247,11 +1266,13 @@ private:
     void EnsureIsValid();
 
     CGContextRef m_cgContext;
     void EnsureIsValid();
 
     CGContextRef m_cgContext;

-       WindowRef m_windowRef;
-       int m_originX;
-       int m_originY;
-       wxMacCFRefHolder<HIShapeRef> m_clipRgn;
-       bool m_releaseContext;
+    WindowRef m_windowRef;
+    bool m_releaseContext;
+    CGAffineTransform m_windowTransform;
+    wxDouble m_width;
+    wxDouble m_height;
+
+    wxCFRef<HIShapeRef> m_clipRgn;

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------


@@ -1272,184 +1293,297 @@ private:
 
 IMPLEMENT_DYNAMIC_CLASS(wxMacCoreGraphicsContext, wxGraphicsContext)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxMacCoreGraphicsContext, wxGraphicsContext)
 

-void wxMacCoreGraphicsContext::Init()
+class wxQuartzOffsetHelper
+{
+public :
+    wxQuartzOffsetHelper( CGContextRef cg , bool offset )
+    {
+        m_cg = cg;
+        m_offset = offset;
+        if ( m_offset )
+            CGContextTranslateCTM( m_cg, 0.5, 0.5 );
+    }
+    ~wxQuartzOffsetHelper( )
+    {
+        if ( m_offset )
+            CGContextTranslateCTM( m_cg, -0.5, -0.5 );
+    }
+public :
+    CGContextRef m_cg;
+    bool m_offset;
+} ;
+
+void wxMacCoreGraphicsContext::Init()

 {
     m_cgContext = NULL;
 {
     m_cgContext = NULL;

-       m_releaseContext = false;
+    m_releaseContext = false;

     m_windowRef = NULL;
     m_windowRef = NULL;

-       m_originX = 0;
-       m_originY = 0;
+    m_width = 0;
+    m_height = 0;
+

     HIRect r = CGRectMake(0,0,0,0);
     HIRect r = CGRectMake(0,0,0,0);

-    m_clipRgn.Set(HIShapeCreateWithRect(&r));
+    m_clipRgn.reset(HIShapeCreateWithRect(&r));

 }
 
 }
 

-wxMacCoreGraphicsContext::wxMacCoreGraphicsContext( wxGraphicsRenderer* renderer, CGContextRef cgcontext ) : wxGraphicsContext(renderer)
+wxMacCoreGraphicsContext::wxMacCoreGraphicsContext( wxGraphicsRenderer* renderer, CGContextRef cgcontext, wxDouble width, wxDouble height ) : wxGraphicsContext(renderer)

 {
 {

-       Init();
-       m_cgContext = cgcontext;
-    // FIXME: This check is needed because currently we need to use a DC/GraphicsContext
-    // in order to get font properties, like wxFont::GetPixelSize, but since we don't have 
-    // a native window attached to use, I create a wxGraphicsContext with a NULL CGContextRef
-    // for this one operation.
-    
-    // When wxFont::GetPixelSize on Mac no longer needs a graphics context, this check
-    // can be removed. 
-    if (m_cgContext)
-    {
-        CGContextSaveGState( m_cgContext );
-        CGContextSaveGState( m_cgContext );
-    }
+    Init();
+    SetNativeContext(cgcontext);
+    m_width = width;
+    m_height = height;

 }
 
 wxMacCoreGraphicsContext::wxMacCoreGraphicsContext( wxGraphicsRenderer* renderer, WindowRef window ): wxGraphicsContext(renderer)
 {
 }
 
 wxMacCoreGraphicsContext::wxMacCoreGraphicsContext( wxGraphicsRenderer* renderer, WindowRef window ): wxGraphicsContext(renderer)
 {

-       Init();
-       m_windowRef = window;
+    Init();
+    m_windowRef = window;

 }
 
 wxMacCoreGraphicsContext::wxMacCoreGraphicsContext( wxGraphicsRenderer* renderer, wxWindow* window ): wxGraphicsContext(renderer)
 {
 }
 
 wxMacCoreGraphicsContext::wxMacCoreGraphicsContext( wxGraphicsRenderer* renderer, wxWindow* window ): wxGraphicsContext(renderer)
 {

-       Init();
-       m_windowRef = (WindowRef) window->MacGetTopLevelWindowRef();
-    m_originX = m_originY = 0;
-    window->MacWindowToRootWindow( &m_originX , &m_originY );
+    Init();
+    m_windowRef = (WindowRef) window->MacGetTopLevelWindowRef();
+    int originX , originY;
+    originX = originY = 0;
+    window->MacWindowToRootWindow( &originX , &originY );
+
+    Rect bounds = { 0,0,0,0 };
+#ifdef __LP64__
+#else
+    GetWindowBounds( m_windowRef, kWindowContentRgn, &bounds );
+#endif
+    m_windowTransform = CGAffineTransformMakeTranslation( 0 , bounds.bottom - bounds.top );
+    m_windowTransform = CGAffineTransformScale( m_windowTransform , 1 , -1 );
+    m_windowTransform = CGAffineTransformTranslate( m_windowTransform, originX, originY ) ;

 }
 
 wxMacCoreGraphicsContext::wxMacCoreGraphicsContext(wxGraphicsRenderer* renderer) : wxGraphicsContext(renderer)
 {
 }
 
 wxMacCoreGraphicsContext::wxMacCoreGraphicsContext(wxGraphicsRenderer* renderer) : wxGraphicsContext(renderer)
 {

-       Init();
+    Init();

 }
 
 wxMacCoreGraphicsContext::wxMacCoreGraphicsContext() : wxGraphicsContext(NULL)
 {
 }
 
 wxMacCoreGraphicsContext::wxMacCoreGraphicsContext() : wxGraphicsContext(NULL)
 {

-       Init();
+    Init();

     wxLogDebug(wxT("Illegal Constructor called"));
 }
 
 wxMacCoreGraphicsContext::~wxMacCoreGraphicsContext()
 {
     wxLogDebug(wxT("Illegal Constructor called"));
 }
 
 wxMacCoreGraphicsContext::~wxMacCoreGraphicsContext()
 {

-    SetPen(NULL);
-    SetFont(NULL);
-    SetBrush(NULL);
+    SetNativeContext(NULL);
+}
+
+void wxMacCoreGraphicsContext::GetSize( wxDouble* width, wxDouble* height)
+{
+    *width = m_width;
+    *height = m_height;
+}
+
+
+void wxMacCoreGraphicsContext::StartPage( wxDouble width, wxDouble height )
+{
+    CGRect r;
+    if ( width != 0 && height != 0)
+        r = CGRectMake( 0 , 0 , width  , height );
+    else
+        r = CGRectMake( 0 , 0 , m_width  , m_height );

     
     

-    if ( m_cgContext )
-    {
-        // TODO : when is this necessary - should we add a Flush() method ? CGContextSynchronize( m_cgContext );
-        CGContextRestoreGState( m_cgContext );
-        CGContextRestoreGState( m_cgContext );
-    }
+    CGContextBeginPage(m_cgContext,  &r );
+//    CGContextTranslateCTM( m_cgContext , 0 ,  height == 0 ? m_height : height );
+//    CGContextScaleCTM( m_cgContext , 1 , -1 );
+}
+    
+void wxMacCoreGraphicsContext::EndPage()
+{
+    CGContextEndPage(m_cgContext);
+}

 
 

-    if ( m_releaseContext )
-               QDEndCGContext( GetWindowPort( m_windowRef ) , &m_cgContext);
+void wxMacCoreGraphicsContext::Flush()
+{
+    CGContextFlush(m_cgContext);

 }
 
 void wxMacCoreGraphicsContext::EnsureIsValid()
 {
 }
 
 void wxMacCoreGraphicsContext::EnsureIsValid()
 {

-       if ( !m_cgContext )
-       {
-               OSStatus status = QDBeginCGContext( GetWindowPort( m_windowRef ) , &m_cgContext );
-               wxASSERT_MSG( status == noErr , wxT("Cannot nest wxDCs on the same window") );
-               Rect bounds;
-               GetWindowBounds( m_windowRef, kWindowContentRgn, &bounds );
-               CGContextSaveGState( m_cgContext );
-               CGContextTranslateCTM( m_cgContext , 0 , bounds.bottom - bounds.top );
-               CGContextScaleCTM( m_cgContext , 1 , -1 );
-               CGContextTranslateCTM( m_cgContext, m_originX, m_originY );
+    if ( !m_cgContext )
+    {
+        OSStatus status = 
+#ifndef __LP64__
+            QDBeginCGContext( GetWindowPort( m_windowRef ) , &m_cgContext );
+#else
+            paramErr;
+#endif
+        wxASSERT_MSG( status == noErr , wxT("Cannot nest wxDCs on the same window") );
+
+        CGContextConcatCTM( m_cgContext, m_windowTransform );

                CGContextSaveGState( m_cgContext );
                m_releaseContext = true;
                if ( !HIShapeIsEmpty(m_clipRgn) )
                {
                CGContextSaveGState( m_cgContext );
                m_releaseContext = true;
                if ( !HIShapeIsEmpty(m_clipRgn) )
                {

-                       HIShapeReplacePathInCGContext( m_clipRgn, m_cgContext );
+            // the clip region is in device coordinates, so we convert this again to user coordinates
+            wxCFRef<HIMutableShapeRef> hishape( HIShapeCreateMutableCopy( m_clipRgn ) );
+            CGPoint transformedOrigin = CGPointApplyAffineTransform( CGPointZero,m_windowTransform);
+            HIShapeOffset( hishape, -transformedOrigin.x, -transformedOrigin.y );
+                       HIShapeReplacePathInCGContext( hishape, m_cgContext );

                        CGContextClip( m_cgContext );
                }
                        CGContextClip( m_cgContext );
                }

+               CGContextSaveGState( m_cgContext );

        }
 }
 
        }
 }
 

+// TODO test whether the private CGContextSetCompositeOperation works under 10.3 (using NSCompositingModes)
+
+bool wxMacCoreGraphicsContext::SetLogicalFunction( int function )
+{
+    if (m_logicalFunction == function)
+        return true;
+
+    EnsureIsValid();
+    
+    bool retval = false;
+    bool shouldAntiAlias = true;
+    CGBlendMode mode = kCGBlendModeNormal;
+    
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+    if ( UMAGetSystemVersion() >= 0x1050 )
+    {
+        retval = true;
+        switch ( function )
+        {
+            // TODO find best corresponding porter duff modes
+            case wxCOPY :
+                mode = kCGBlendModeCopy;
+                break;
+            case wxCLEAR :
+                mode = kCGBlendModeClear;
+                break;
+            case wxXOR :
+                mode = kCGBlendModeXOR;
+                shouldAntiAlias = false;
+                break;  
+            default :
+                retval = false;
+                break;
+        }
+    }
+    else
+#endif
+    {
+        if ( function == wxCOPY )
+        {
+            retval = true;
+        }
+        else if ( function == wxINVERT || function == wxXOR )
+        {
+            // change color to white
+            mode = kCGBlendModeExclusion;
+            shouldAntiAlias = false;
+            retval = true;
+        }
+    }
+    
+    if (retval)
+    {
+        m_logicalFunction = function;
+        CGContextSetBlendMode( m_cgContext, mode );
+        CGContextSetShouldAntialias(m_cgContext, shouldAntiAlias);
+    }
+    return retval ;
+}

 
 void wxMacCoreGraphicsContext::Clip( const wxRegion &region )
 {
 
 void wxMacCoreGraphicsContext::Clip( const wxRegion &region )
 {

-       if( m_cgContext )
-       {
-               HIShapeRef shape = HIShapeCreateWithQDRgn( (RgnHandle) region.GetWXHRGN() );
-               HIShapeReplacePathInCGContext( shape, m_cgContext );
-               CGContextClip( m_cgContext );
-               CFRelease( shape );
-       }
-       else
-       {
-               m_clipRgn.Set(HIShapeCreateWithQDRgn( (RgnHandle) region.GetWXHRGN() ));
-       }
+    if( m_cgContext )
+    {
+        HIShapeReplacePathInCGContext( region.GetWXHRGN() , m_cgContext );
+        CGContextClip( m_cgContext );
+    }
+    else
+    {
+        // this offsetting to device coords is not really correct, but since we cannot apply affine transforms
+        // to regions we try at least to have correct translations
+        HIMutableShapeRef mutableShape = HIShapeCreateMutableCopy( region.GetWXHRGN() );
+        
+        CGPoint transformedOrigin = CGPointApplyAffineTransform( CGPointZero, m_windowTransform );
+        HIShapeOffset( mutableShape, transformedOrigin.x, transformedOrigin.y );
+        m_clipRgn.reset(mutableShape);
+    }

 }
 
 // clips drawings to the rect
 void wxMacCoreGraphicsContext::Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h )
 {
 }
 
 // clips drawings to the rect
 void wxMacCoreGraphicsContext::Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h )
 {

-       HIRect r = CGRectMake( x , y , w , h );
-       if ( m_cgContext )
-       {
-               CGContextClipToRect( m_cgContext, r );
-       }
-       else
-       {
-               m_clipRgn.Set(HIShapeCreateWithRect(&r));
-       }
+    HIRect r = CGRectMake( x , y , w , h );
+    if ( m_cgContext )
+    {
+        CGContextClipToRect( m_cgContext, r );
+    }
+    else
+    {
+        // the clipping itself must be stored as device coordinates, otherwise 
+        // we cannot apply it back correctly
+        r.origin= CGPointApplyAffineTransform( r.origin, m_windowTransform );
+        m_clipRgn.reset(HIShapeCreateWithRect(&r));
+    }

 }
 }

-       
-       // resets the clipping to original extent
+
+    // resets the clipping to original extent

 void wxMacCoreGraphicsContext::ResetClip()
 {
 void wxMacCoreGraphicsContext::ResetClip()
 {

-       if ( m_cgContext )
-       {
-               CGContextRestoreGState( m_cgContext );
-               CGContextSaveGState( m_cgContext );
-       }
-       else
-       {
+    if ( m_cgContext )
+    {
+        // there is no way for clearing the clip, we can only revert to the stored
+        // state, but then we have to make sure everything else is NOT restored
+        CGAffineTransform transform = CGContextGetCTM( m_cgContext );
+        CGContextRestoreGState( m_cgContext );
+        CGContextSaveGState( m_cgContext );
+        CGAffineTransform transformNew = CGContextGetCTM( m_cgContext );
+        transformNew = CGAffineTransformInvert( transformNew ) ;
+        CGContextConcatCTM( m_cgContext, transformNew);
+        CGContextConcatCTM( m_cgContext, transform);
+    }
+    else
+    {

         HIRect r = CGRectMake(0,0,0,0);
         HIRect r = CGRectMake(0,0,0,0);

-        m_clipRgn.Set(HIShapeCreateWithRect(&r));
-       }
+        m_clipRgn.reset(HIShapeCreateWithRect(&r));
+    }

 }
 
 }
 

-void wxMacCoreGraphicsContext::StrokePath( const wxGraphicsPath *path )
+void wxMacCoreGraphicsContext::StrokePath( const wxGraphicsPath &path )

 {
 {

-    if ( m_pen == NULL )
+    if ( m_pen.IsNull() )

         return ;
 
         return ;
 

-       EnsureIsValid();
-       
-    bool offset = ShouldOffset();
-    if ( offset )
-        CGContextTranslateCTM( m_cgContext, 0.5, 0.5 );
+    EnsureIsValid();

 
 

-    m_pen->Apply(this);
-    CGContextAddPath( m_cgContext , (CGPathRef) path->GetNativePath() );
-    CGContextStrokePath( m_cgContext );
+    wxQuartzOffsetHelper helper( m_cgContext , ShouldOffset() );

 
 

-    if ( offset )
-        CGContextTranslateCTM( m_cgContext, -0.5, -0.5 );
+    ((wxMacCoreGraphicsPenData*)m_pen.GetRefData())->Apply(this);
+    CGContextAddPath( m_cgContext , (CGPathRef) path.GetNativePath() );
+    CGContextStrokePath( m_cgContext );

 }
 
 }
 

-void wxMacCoreGraphicsContext::DrawPath( const wxGraphicsPath *path , int fillStyle )
-{        
-    if ( m_brush != NULL && ((wxMacCoreGraphicsBrush*)m_brush)->IsShading() )
+void wxMacCoreGraphicsContext::DrawPath( const wxGraphicsPath &path , int fillStyle )
+{
+    if ( !m_brush.IsNull() && ((wxMacCoreGraphicsBrushData*)m_brush.GetRefData())->IsShading() )

     {
         // when using shading, we cannot draw pen and brush at the same time
         // revert to the base implementation of first filling and then stroking
         wxGraphicsContext::DrawPath( path, fillStyle );
         return;
     }
     {
         // when using shading, we cannot draw pen and brush at the same time
         // revert to the base implementation of first filling and then stroking
         wxGraphicsContext::DrawPath( path, fillStyle );
         return;
     }

-    
+

     CGPathDrawingMode mode = kCGPathFill ;
     CGPathDrawingMode mode = kCGPathFill ;

-    if ( m_brush == NULL )
+    if ( m_brush.IsNull() )

     {
     {

-        if ( m_pen == NULL )
+        if ( m_pen.IsNull() )

             return;
         else
             mode = kCGPathStroke;
     }
     else
     {
             return;
         else
             mode = kCGPathStroke;
     }
     else
     {

-        if ( m_pen == NULL )
+        if ( m_pen.IsNull() )

         {
             if ( fillStyle == wxODDEVEN_RULE )
                 mode = kCGPathEOFill;
         {
             if ( fillStyle == wxODDEVEN_RULE )
                 mode = kCGPathEOFill;


@@ -1464,43 +1598,39 @@ void wxMacCoreGraphicsContext::DrawPath( const wxGraphicsPath *path , int fillSt
                 mode = kCGPathFillStroke;
         }
     }
                 mode = kCGPathFillStroke;
         }
     }

-        
-       EnsureIsValid();

 
 

-    if ( m_brush )
-        m_brush->Apply(this);
+    EnsureIsValid();

 
 

-    bool offset = ShouldOffset();
-    
-    if ( offset )
-        CGContextTranslateCTM( m_cgContext, 0.5, 0.5 );
+    if ( !m_brush.IsNull() )
+        ((wxMacCoreGraphicsBrushData*)m_brush.GetRefData())->Apply(this);
+    if ( !m_pen.IsNull() )
+        ((wxMacCoreGraphicsPenData*)m_pen.GetRefData())->Apply(this);

 
 

-    CGContextAddPath( m_cgContext , (CGPathRef) path->GetNativePath() );
-    CGContextDrawPath( m_cgContext , mode );
+    wxQuartzOffsetHelper helper( m_cgContext , ShouldOffset() );

 
 

-    if ( offset )
-        CGContextTranslateCTM( m_cgContext, -0.5, -0.5 );
+    CGContextAddPath( m_cgContext , (CGPathRef) path.GetNativePath() );
+    CGContextDrawPath( m_cgContext , mode );

 }
 
 }
 

-void wxMacCoreGraphicsContext::FillPath( const wxGraphicsPath *path , int fillStyle )
+void wxMacCoreGraphicsContext::FillPath( const wxGraphicsPath &path , int fillStyle )

 {
 {

-    if ( m_brush == NULL )
+    if ( m_brush.IsNull() )

         return;
         return;

-        
-       EnsureIsValid();
-    
-    if ( ((wxMacCoreGraphicsBrush*)m_brush)->IsShading() )
+
+    EnsureIsValid();
+
+    if ( ((wxMacCoreGraphicsBrushData*)m_brush.GetRefData())->IsShading() )

     {
         CGContextSaveGState( m_cgContext );
     {
         CGContextSaveGState( m_cgContext );

-        CGContextAddPath( m_cgContext , (CGPathRef) path->GetNativePath() );
+        CGContextAddPath( m_cgContext , (CGPathRef) path.GetNativePath() );

         CGContextClip( m_cgContext );
         CGContextClip( m_cgContext );

-        CGContextDrawShading( m_cgContext, ((wxMacCoreGraphicsBrush*)m_brush)->GetShading() );
+        CGContextDrawShading( m_cgContext, ((wxMacCoreGraphicsBrushData*)m_brush.GetRefData())->GetShading() );

         CGContextRestoreGState( m_cgContext);
     }
     else
         CGContextRestoreGState( m_cgContext);
     }
     else

-    {  
-        m_brush->Apply(this);
-        CGContextAddPath( m_cgContext , (CGPathRef) path->GetNativePath() );
+    {
+        ((wxMacCoreGraphicsBrushData*)m_brush.GetRefData())->Apply(this);
+        CGContextAddPath( m_cgContext , (CGPathRef) path.GetNativePath() );

         if ( fillStyle == wxODDEVEN_RULE )
             CGContextEOFillPath( m_cgContext );
         else
         if ( fillStyle == wxODDEVEN_RULE )
             CGContextEOFillPath( m_cgContext );
         else


@@ -1513,46 +1643,104 @@ void wxMacCoreGraphicsContext::SetNativeContext( CGContextRef cg )
     // we allow either setting or clearing but not replacing
     wxASSERT( m_cgContext == NULL || cg == NULL );
 
     // we allow either setting or clearing but not replacing
     wxASSERT( m_cgContext == NULL || cg == NULL );
 

-    if ( cg )
-        CGContextSaveGState( cg );
+    if ( m_cgContext )
+    {
+        // TODO : when is this necessary - should we add a Flush() method ? CGContextSynchronize( m_cgContext );
+        CGContextRestoreGState( m_cgContext );
+        CGContextRestoreGState( m_cgContext );
+        if ( m_releaseContext )
+        {
+#ifndef __LP64__
+            QDEndCGContext( GetWindowPort( m_windowRef ) , &m_cgContext);
+#endif
+        }
+        else
+            CGContextRelease(m_cgContext);
+    }
+
+

     m_cgContext = cg;
     m_cgContext = cg;

+
+    // FIXME: This check is needed because currently we need to use a DC/GraphicsContext
+    // in order to get font properties, like wxFont::GetPixelSize, but since we don't have
+    // a native window attached to use, I create a wxGraphicsContext with a NULL CGContextRef
+    // for this one operation.
+
+    // When wxFont::GetPixelSize on Mac no longer needs a graphics context, this check
+    // can be removed.
+    if (m_cgContext)
+    {
+        CGContextRetain(m_cgContext);
+        CGContextSaveGState( m_cgContext );
+        CGContextSaveGState( m_cgContext );
+        m_releaseContext = false;
+    }

 }
 
 }
 

-void wxMacCoreGraphicsContext::Translate( wxDouble dx , wxDouble dy ) 
+void wxMacCoreGraphicsContext::Translate( wxDouble dx , wxDouble dy )

 {
 {

-       EnsureIsValid();
-       
-    CGContextTranslateCTM( m_cgContext, dx, dy );
+    if ( m_cgContext )
+        CGContextTranslateCTM( m_cgContext, dx, dy );
+    else
+        m_windowTransform = CGAffineTransformTranslate(m_windowTransform,dx,dy);

 }
 
 void wxMacCoreGraphicsContext::Scale( wxDouble xScale , wxDouble yScale )
 {
 }
 
 void wxMacCoreGraphicsContext::Scale( wxDouble xScale , wxDouble yScale )
 {

-       EnsureIsValid();
-       
-    CGContextScaleCTM( m_cgContext , xScale , yScale );
+    if ( m_cgContext )
+        CGContextScaleCTM( m_cgContext , xScale , yScale );
+    else
+        m_windowTransform = CGAffineTransformScale(m_windowTransform,xScale,yScale);

 }
 
 void wxMacCoreGraphicsContext::Rotate( wxDouble angle )
 {
 }
 
 void wxMacCoreGraphicsContext::Rotate( wxDouble angle )
 {

-       EnsureIsValid();
-       
-    CGContextRotateCTM( m_cgContext , angle );
+    if ( m_cgContext )
+        CGContextRotateCTM( m_cgContext , angle );
+    else
+        m_windowTransform = CGAffineTransformRotate(m_windowTransform,angle);

 }
 
 }
 

-void wxMacCoreGraphicsContext::DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) 
+void wxMacCoreGraphicsContext::DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h )

 {
 {

-       EnsureIsValid();
-       
-    CGImageRef image = (CGImageRef)( bmp.CGImageCreate() );
+    EnsureIsValid();
+
+    CGImageRef image = (CGImageRef)( bmp.CreateCGImage() );

     HIRect r = CGRectMake( x , y , w , h );
     HIRect r = CGRectMake( x , y , w , h );

-    HIViewDrawCGImage( m_cgContext , &r , image );
+    if ( bmp.GetDepth() == 1 )
+    {
+        // is is a mask, the '1' in the mask tell where to draw the current brush
+        if (  !m_brush.IsNull() )
+        {
+            if ( ((wxMacCoreGraphicsBrushData*)m_brush.GetRefData())->IsShading() )
+            {
+                // TODO clip to mask
+            /*
+                CGContextSaveGState( m_cgContext );
+                CGContextAddPath( m_cgContext , (CGPathRef) path.GetNativePath() );
+                CGContextClip( m_cgContext );
+                CGContextDrawShading( m_cgContext, ((wxMacCoreGraphicsBrushData*)m_brush.GetRefData())->GetShading() );
+                CGContextRestoreGState( m_cgContext);
+            */
+            }
+            else
+            {
+                ((wxMacCoreGraphicsBrushData*)m_brush.GetRefData())->Apply(this);
+                wxMacDrawCGImage( m_cgContext , &r , image );
+            }
+        }
+    }
+    else
+    {
+        wxMacDrawCGImage( m_cgContext , &r , image );
+    }

     CGImageRelease( image );
 }
 
     CGImageRelease( image );
 }
 

-void wxMacCoreGraphicsContext::DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) 
+void wxMacCoreGraphicsContext::DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h )

 {
 {

-       EnsureIsValid();
-       
+    EnsureIsValid();
+

     CGRect r = CGRectMake( 00 , 00 , w , h );
     CGContextSaveGState( m_cgContext );
     CGContextTranslateCTM( m_cgContext, x , y + h );
     CGRect r = CGRectMake( 00 , 00 , w , h );
     CGContextSaveGState( m_cgContext );
     CGContextTranslateCTM( m_cgContext, x , y + h );


@@ -1564,234 +1752,252 @@ void wxMacCoreGraphicsContext::DrawIcon( const wxIcon &icon, wxDouble x, wxDoubl
 
 void wxMacCoreGraphicsContext::PushState()
 {
 
 void wxMacCoreGraphicsContext::PushState()
 {

-       EnsureIsValid();
-       
-    CGContextSaveGState( m_cgContext );
-}
-
-void wxMacCoreGraphicsContext::PopState() 
-{
-       EnsureIsValid();
-       
-    CGContextRestoreGState( m_cgContext );
-}
-
-// sets the pen
-void wxMacCoreGraphicsContext::SetPen( wxGraphicsPen* pen , bool release )
-{
-    wxGraphicsContext::SetPen( pen, release );
-}
+    EnsureIsValid();

 
 

-// sets the brush for filling
-void wxMacCoreGraphicsContext::SetBrush( wxGraphicsBrush* brush , bool release )
-{
-    wxGraphicsContext::SetBrush( brush, release );
+    CGContextSaveGState( m_cgContext );

 }
 
 }
 

-// sets the font
-void wxMacCoreGraphicsContext::SetFont( wxGraphicsFont* font, bool release )
+void wxMacCoreGraphicsContext::PopState()

 {
 {

-    wxGraphicsContext::SetFont( font, release );
-}
+    EnsureIsValid();

 
 

-void wxMacCoreGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y ) 
-{
-    DrawText(str, x, y, 0.0);
+    CGContextRestoreGState( m_cgContext );

 }
 
 }
 

-void wxMacCoreGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, wxDouble angle ) 
+void wxMacCoreGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y )

 {
 {

-    if ( m_font == NULL )
+    if ( m_font.IsNull() )

         return;
         return;

+    
+    EnsureIsValid();
+#if wxMAC_USE_CORE_TEXT
+    if ( UMAGetSystemVersion() >= 0x1050 )
+    {
+        wxMacCoreGraphicsFontData* fref = (wxMacCoreGraphicsFontData*)m_font.GetRefData();
+        wxCFStringRef text(str, wxLocale::GetSystemEncoding() );
+        CTFontRef font = fref->GetCTFont();
+        CGColorRef col = fref->GetColour().GetPixel();
+        CTUnderlineStyle ustyle = fref->GetUnderlined() ? kCTUnderlineStyleSingle : kCTUnderlineStyleNone ;
+        wxCFRef<CFNumberRef> underlined( CFNumberCreate(NULL, kCFNumberSInt32Type, &ustyle) ); 
+         CFStringRef keys[] = { kCTFontAttributeName , kCTForegroundColorAttributeName, kCTUnderlineStyleAttributeName };
+        CFTypeRef values[] = { font, col, underlined };
+        wxCFRef<CFDictionaryRef> attributes( CFDictionaryCreate(kCFAllocatorDefault, (const void**) &keys, (const void**) &values, 
+                                                        WXSIZEOF( keys ), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks) );
+        wxCFRef<CFAttributedStringRef> attrtext( CFAttributedStringCreate(kCFAllocatorDefault, text, attributes) );
+        wxCFRef<CTLineRef> line( CTLineCreateWithAttributedString(attrtext) );

         
         

-       EnsureIsValid();
-       
-    OSStatus status = noErr;
-    ATSUTextLayout atsuLayout;
-    UniCharCount chars = str.length();
-    UniChar* ubuf = NULL;
-
-#if SIZEOF_WCHAR_T == 4
-    wxMBConvUTF16 converter;
-#if wxUSE_UNICODE
-    size_t unicharlen = converter.WC2MB( NULL , str.wc_str() , 0 );
-    ubuf = (UniChar*) malloc( unicharlen + 2 );
-    converter.WC2MB( (char*) ubuf , str.wc_str(), unicharlen + 2 );
-#else
-    const wxWCharBuffer wchar = str.wc_str( wxConvLocal );
-    size_t unicharlen = converter.WC2MB( NULL , wchar.data() , 0 );
-    ubuf = (UniChar*) malloc( unicharlen + 2 );
-    converter.WC2MB( (char*) ubuf , wchar.data() , unicharlen + 2 );
+        y += CTFontGetAscent(font);
+        
+        CGContextSaveGState(m_cgContext);
+        CGContextTranslateCTM(m_cgContext, x, y);
+        CGContextScaleCTM(m_cgContext, 1, -1);
+        CGContextSetTextPosition(m_cgContext, 0, 0);
+        CTLineDraw( line, m_cgContext );
+        CGContextRestoreGState(m_cgContext);
+        return;
+    }

 #endif
 #endif

-    chars = unicharlen / 2;
-#else
-#if wxUSE_UNICODE
-    ubuf = (UniChar*) str.wc_str();
-#else
-    wxWCharBuffer wchar = str.wc_str( wxConvLocal );
-    chars = wxWcslen( wchar.data() );
-    ubuf = (UniChar*) wchar.data();
+#if wxMAC_USE_ATSU_TEXT
+    {
+        DrawText(str, x, y, 0.0);
+        return;
+    }

 #endif
 #endif

+#if wxMAC_USE_CG_TEXT
+    // TODO core graphics text implementation here

 #endif
 #endif

+}

 
 

-    ATSUStyle style = (((wxMacCoreGraphicsFont*)m_font)->GetATSUStyle());
-    status = ::ATSUCreateTextLayoutWithTextPtr( (UniCharArrayPtr) ubuf , 0 , chars , chars , 1 ,
-        &chars , &style , &atsuLayout );
-
-    wxASSERT_MSG( status == noErr , wxT("couldn't create the layout of the rotated text") );
-
-    status = ::ATSUSetTransientFontMatching( atsuLayout , true );
-    wxASSERT_MSG( status == noErr , wxT("couldn't setup transient font matching") );
+void wxMacCoreGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, wxDouble angle )
+{
+    if ( m_font.IsNull() )
+        return;

 
 

-    int iAngle = int( angle * RAD2DEG );
-    if ( abs(iAngle) > 0 )
+    EnsureIsValid();
+#if wxMAC_USE_CORE_TEXT
+    if ( UMAGetSystemVersion() >= 0x1050 )

     {
     {

-        Fixed atsuAngle = IntToFixed( iAngle );
-        ATSUAttributeTag atsuTags[] =
-        {
-            kATSULineRotationTag ,
-        };
-        ByteCount atsuSizes[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] =
-        {
-            sizeof( Fixed ) ,
-        };
-        ATSUAttributeValuePtr    atsuValues[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] =
-        {
-            &atsuAngle ,
-        };
-        status = ::ATSUSetLayoutControls(atsuLayout , sizeof(atsuTags) / sizeof(ATSUAttributeTag),
-            atsuTags, atsuSizes, atsuValues );
+        // default implementation takes care of rotation and calls non rotated DrawText afterwards
+        wxGraphicsContext::DrawText( str, x, y, angle );
+        return;

     }
     }

-
+#endif
+#if wxMAC_USE_ATSU_TEXT

     {
     {

-        ATSUAttributeTag atsuTags[] =
-        {
-            kATSUCGContextTag ,
-        };
-        ByteCount atsuSizes[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] =
+        OSStatus status = noErr;
+        ATSUTextLayout atsuLayout;
+        wxMacUniCharBuffer unibuf( str );
+        UniCharCount chars = unibuf.GetChars();
+
+        ATSUStyle style = (((wxMacCoreGraphicsFontData*)m_font.GetRefData())->GetATSUStyle());
+        status = ::ATSUCreateTextLayoutWithTextPtr( unibuf.GetBuffer() , 0 , chars , chars , 1 ,
+                                                   &chars , &style , &atsuLayout );
+        
+        wxASSERT_MSG( status == noErr , wxT("couldn't create the layout of the rotated text") );
+        
+        status = ::ATSUSetTransientFontMatching( atsuLayout , true );
+        wxASSERT_MSG( status == noErr , wxT("couldn't setup transient font matching") );
+        
+        int iAngle = int( angle * RAD2DEG );
+        if ( abs(iAngle) > 0 )

         {
         {

-            sizeof( CGContextRef ) ,
-        };
-        ATSUAttributeValuePtr    atsuValues[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] =
+            Fixed atsuAngle = IntToFixed( iAngle );
+            ATSUAttributeTag atsuTags[] =
+            {
+                kATSULineRotationTag ,
+            };
+            ByteCount atsuSizes[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] =
+            {
+                sizeof( Fixed ) ,
+            };
+            ATSUAttributeValuePtr    atsuValues[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] =
+            {
+                &atsuAngle ,
+            };
+            status = ::ATSUSetLayoutControls(atsuLayout , sizeof(atsuTags) / sizeof(ATSUAttributeTag),
+                                             atsuTags, atsuSizes, atsuValues );
+        }
+        

         {
         {

-            &m_cgContext ,
-        };
-        status = ::ATSUSetLayoutControls(atsuLayout , sizeof(atsuTags) / sizeof(ATSUAttributeTag),
-            atsuTags, atsuSizes, atsuValues );
-    }
-
-    ATSUTextMeasurement textBefore, textAfter;
-    ATSUTextMeasurement ascent, descent;
-
-    status = ::ATSUGetUnjustifiedBounds( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd,
-        &textBefore , &textAfter, &ascent , &descent );
-
-    wxASSERT_MSG( status == noErr , wxT("couldn't measure the rotated text") );
-
-    Rect rect;
-/*
-    // TODO
-    if ( m_backgroundMode == wxSOLID )
-    {
-        wxGraphicsPath* path = m_graphicContext->CreatePath();
-        path->MoveToPoint( drawX , drawY );
-        path->AddLineToPoint(
-            (int) (drawX + sin(angle / RAD2DEG) * FixedToInt(ascent + descent)) ,
-            (int) (drawY + cos(angle / RAD2DEG) * FixedToInt(ascent + descent)) );
-        path->AddLineToPoint(
-            (int) (drawX + sin(angle / RAD2DEG) * FixedToInt(ascent + descent ) + cos(angle / RAD2DEG) * FixedToInt(textAfter)) ,
-            (int) (drawY + cos(angle / RAD2DEG) * FixedToInt(ascent + descent) - sin(angle / RAD2DEG) * FixedToInt(textAfter)) );
-        path->AddLineToPoint(
-            (int) (drawX + cos(angle / RAD2DEG) * FixedToInt(textAfter)) ,
-            (int) (drawY - sin(angle / RAD2DEG) * FixedToInt(textAfter)) );
-
-        m_graphicContext->FillPath( path , m_textBackgroundColour );
-        delete path;
+            ATSUAttributeTag atsuTags[] =
+            {
+                kATSUCGContextTag ,
+            };
+            ByteCount atsuSizes[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] =
+            {
+                sizeof( CGContextRef ) ,
+            };
+            ATSUAttributeValuePtr    atsuValues[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] =
+            {
+                &m_cgContext ,
+            };
+            status = ::ATSUSetLayoutControls(atsuLayout , sizeof(atsuTags) / sizeof(ATSUAttributeTag),
+                                             atsuTags, atsuSizes, atsuValues );
+        }
+        
+        ATSUTextMeasurement textBefore, textAfter;
+        ATSUTextMeasurement ascent, descent;
+        
+        status = ::ATSUGetUnjustifiedBounds( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd,
+                                            &textBefore , &textAfter, &ascent , &descent );
+        
+        wxASSERT_MSG( status == noErr , wxT("couldn't measure the rotated text") );
+        
+        Rect rect;
+        x += (int)(sin(angle) * FixedToInt(ascent));
+        y += (int)(cos(angle) * FixedToInt(ascent));
+        
+        status = ::ATSUMeasureTextImage( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd,
+                                        IntToFixed(x) , IntToFixed(y) , &rect );
+        wxASSERT_MSG( status == noErr , wxT("couldn't measure the rotated text") );
+        
+        CGContextSaveGState(m_cgContext);
+        CGContextTranslateCTM(m_cgContext, x, y);
+        CGContextScaleCTM(m_cgContext, 1, -1);
+        status = ::ATSUDrawText( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd,
+                                IntToFixed(0) , IntToFixed(0) );
+        
+        wxASSERT_MSG( status == noErr , wxT("couldn't draw the rotated text") );
+        
+        CGContextRestoreGState(m_cgContext);
+        
+        ::ATSUDisposeTextLayout(atsuLayout);
+        
+        return;

     }
     }

-*/
-    x += (int)(sin(angle / RAD2DEG) * FixedToInt(ascent));
-    y += (int)(cos(angle / RAD2DEG) * FixedToInt(ascent));
-
-    status = ::ATSUMeasureTextImage( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd,
-        IntToFixed(x) , IntToFixed(y) , &rect );
-    wxASSERT_MSG( status == noErr , wxT("couldn't measure the rotated text") );
-
-    CGContextSaveGState(m_cgContext);
-    CGContextTranslateCTM(m_cgContext, x, y);
-    CGContextScaleCTM(m_cgContext, 1, -1);
-    status = ::ATSUDrawText( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd,
-        IntToFixed(0) , IntToFixed(0) );
-
-    wxASSERT_MSG( status == noErr , wxT("couldn't draw the rotated text") );
-
-    CGContextRestoreGState(m_cgContext);
-
-    ::ATSUDisposeTextLayout(atsuLayout);
-
-#if SIZEOF_WCHAR_T == 4
-    free( ubuf );
+#endif
+#if wxMAC_USE_CG_TEXT
+    // default implementation takes care of rotation and calls non rotated DrawText afterwards
+    wxGraphicsContext::DrawText( str, x, y, angle );

 #endif
 }
 #endif
 }

-    
+

 void wxMacCoreGraphicsContext::GetTextExtent( const wxString &str, wxDouble *width, wxDouble *height,
                             wxDouble *descent, wxDouble *externalLeading ) const
 {
 void wxMacCoreGraphicsContext::GetTextExtent( const wxString &str, wxDouble *width, wxDouble *height,
                             wxDouble *descent, wxDouble *externalLeading ) const
 {

-    wxCHECK_RET( m_font != NULL, wxT("wxDC(cg)::DoGetTextExtent - no valid font set") );
-
-    OSStatus status = noErr;
-    
-    ATSUTextLayout atsuLayout;
-    UniCharCount chars = str.length();
-    UniChar* ubuf = NULL;
-
-#if SIZEOF_WCHAR_T == 4
-    wxMBConvUTF16 converter;
-#if wxUSE_UNICODE
-    size_t unicharlen = converter.WC2MB( NULL , str.wc_str() , 0 );
-    ubuf = (UniChar*) malloc( unicharlen + 2 );
-    converter.WC2MB( (char*) ubuf , str.wc_str(), unicharlen + 2 );
-#else
-    const wxWCharBuffer wchar = str.wc_str( wxConvLocal );
-    size_t unicharlen = converter.WC2MB( NULL , wchar.data() , 0 );
-    ubuf = (UniChar*) malloc( unicharlen + 2 );
-    converter.WC2MB( (char*) ubuf , wchar.data() , unicharlen + 2 );
-#endif
-    chars = unicharlen / 2;
-#else
-#if wxUSE_UNICODE
-    ubuf = (UniChar*) str.wc_str();
-#else
-    wxWCharBuffer wchar = str.wc_str( wxConvLocal );
-    chars = wxWcslen( wchar.data() );
-    ubuf = (UniChar*) wchar.data();
-#endif
-#endif
-
-    ATSUStyle style = (((wxMacCoreGraphicsFont*)m_font)->GetATSUStyle());
-    status = ::ATSUCreateTextLayoutWithTextPtr( (UniCharArrayPtr) ubuf , 0 , chars , chars , 1 ,
-        &chars , &style , &atsuLayout );
-
-    wxASSERT_MSG( status == noErr , wxT("couldn't create the layout of the text") );
-
-    ATSUTextMeasurement textBefore, textAfter;
-    ATSUTextMeasurement textAscent, textDescent;
-
-    status = ::ATSUGetUnjustifiedBounds( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd,
-        &textBefore , &textAfter, &textAscent , &textDescent );
+    wxCHECK_RET( !m_font.IsNull(), wxT("wxDC(cg)::DoGetTextExtent - no valid font set") );

 
 

+    if ( width )
+        *width = 0;

     if ( height )
     if ( height )

-        *height = FixedToInt(textAscent + textDescent);
+        *height = 0;

     if ( descent )
     if ( descent )

-        *descent = FixedToInt(textDescent);
+        *descent = 0;

     if ( externalLeading )
         *externalLeading = 0;
     if ( externalLeading )
         *externalLeading = 0;

-    if ( width )
-        *width = FixedToInt(textAfter - textBefore);
+        
+    if (str.empty())
+        return;
+
+#if wxMAC_USE_CORE_TEXT
+    if ( UMAGetSystemVersion() >= 0x1050 )
+    {
+        wxMacCoreGraphicsFontData* fref = (wxMacCoreGraphicsFontData*)m_font.GetRefData();
+        CTFontRef font = fref->GetCTFont();
+
+        wxCFStringRef text(str, wxLocale::GetSystemEncoding() );
+        CFStringRef keys[] = { kCTFontAttributeName  };
+        CFTypeRef values[] = { font };
+        wxCFRef<CFDictionaryRef> attributes( CFDictionaryCreate(kCFAllocatorDefault, (const void**) &keys, (const void**) &values, 
+                                                                WXSIZEOF( keys ), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks) );
+        wxCFRef<CFAttributedStringRef> attrtext( CFAttributedStringCreate(kCFAllocatorDefault, text, attributes) );
+        wxCFRef<CTLineRef> line( CTLineCreateWithAttributedString(attrtext) );
+            
+        CGFloat w, a, d, l;
+        
+        w = CTLineGetTypographicBounds(line, &a, &d, &l) ;
+        
+        if ( height )
+            *height = a+d+l;
+        if ( descent )
+            *descent = d;
+        if ( externalLeading )
+            *externalLeading = l;
+        if ( width )
+            *width = w;
+        return;
+    }
+#endif
+#if wxMAC_USE_ATSU_TEXT
+    {
+        OSStatus status = noErr;
+        
+        ATSUTextLayout atsuLayout;
+        wxMacUniCharBuffer unibuf( str );
+        UniCharCount chars = unibuf.GetChars();
+        
+        ATSUStyle style = (((wxMacCoreGraphicsFontData*)m_font.GetRefData())->GetATSUStyle());
+        status = ::ATSUCreateTextLayoutWithTextPtr( unibuf.GetBuffer() , 0 , chars , chars , 1 ,
+                                                   &chars , &style , &atsuLayout );
+        
+        wxASSERT_MSG( status == noErr , wxT("couldn't create the layout of the text") );
+        
+        ATSUTextMeasurement textBefore, textAfter;
+        ATSUTextMeasurement textAscent, textDescent;
+        
+        status = ::ATSUGetUnjustifiedBounds( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd,
+                                            &textBefore , &textAfter, &textAscent , &textDescent );
+        
+        if ( height )
+            *height = FixedToInt(textAscent + textDescent);
+        if ( descent )
+            *descent = FixedToInt(textDescent);
+        if ( externalLeading )
+            *externalLeading = 0;
+        if ( width )
+            *width = FixedToInt(textAfter - textBefore);
+        
+        ::ATSUDisposeTextLayout(atsuLayout);

 
 

-    ::ATSUDisposeTextLayout(atsuLayout);
+        return;
+    }
+#endif
+#if wxMAC_USE_CG_TEXT
+    // TODO core graphics text implementation here
+#endif

 }
 
 }
 

-void wxMacCoreGraphicsContext::GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const 
+void wxMacCoreGraphicsContext::GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const

 {
     widths.Empty();
     widths.Add(0, text.length());
 {
     widths.Empty();
     widths.Add(0, text.length());


@@ -1799,74 +2005,99 @@ void wxMacCoreGraphicsContext::GetPartialTextExtents(const wxString& text, wxArr
     if (text.empty())
         return;
 
     if (text.empty())
         return;
 

-    ATSUTextLayout atsuLayout;
-    UniCharCount chars = text.length();
-    UniChar* ubuf = NULL;
-
-#if SIZEOF_WCHAR_T == 4
-    wxMBConvUTF16 converter;
-#if wxUSE_UNICODE
-    size_t unicharlen = converter.WC2MB( NULL , text.wc_str() , 0 );
-    ubuf = (UniChar*) malloc( unicharlen + 2 );
-    converter.WC2MB( (char*) ubuf , text.wc_str(), unicharlen + 2 );
-#else
-    const wxWCharBuffer wchar = text.wc_str( wxConvLocal );
-    size_t unicharlen = converter.WC2MB( NULL , wchar.data() , 0 );
-    ubuf = (UniChar*) malloc( unicharlen + 2 );
-    converter.WC2MB( (char*) ubuf , wchar.data() , unicharlen + 2 );
-#endif
-    chars = unicharlen / 2;
-#else
-#if wxUSE_UNICODE
-    ubuf = (UniChar*) text.wc_str();
-#else
-    wxWCharBuffer wchar = text.wc_str( wxConvLocal );
-    chars = wxWcslen( wchar.data() );
-    ubuf = (UniChar*) wchar.data();
-#endif
+#if wxMAC_USE_CORE_TEXT
+    {
+        wxMacCoreGraphicsFontData* fref = (wxMacCoreGraphicsFontData*)m_font.GetRefData();
+        CTFontRef font = fref->GetCTFont();
+        
+        wxCFStringRef t(text, wxLocale::GetSystemEncoding() );
+        CFStringRef keys[] = { kCTFontAttributeName  };
+        CFTypeRef values[] = { font };
+        wxCFRef<CFDictionaryRef> attributes( CFDictionaryCreate(kCFAllocatorDefault, (const void**) &keys, (const void**) &values, 
+                                                                WXSIZEOF( keys ), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks) );
+        wxCFRef<CFAttributedStringRef> attrtext( CFAttributedStringCreate(kCFAllocatorDefault, t, attributes) );
+        wxCFRef<CTLineRef> line( CTLineCreateWithAttributedString(attrtext) );
+        
+        int chars = text.length();
+        for ( int pos = 0; pos < (int)chars; pos ++ )
+        {
+            widths[pos] = CTLineGetOffsetForStringIndex( line, pos+1 , NULL )+0.5;
+        }
+        
+        return;
+    }

 #endif
 #endif

-
-    ATSUStyle style = (((wxMacCoreGraphicsFont*)m_font)->GetATSUStyle());
-    ::ATSUCreateTextLayoutWithTextPtr( (UniCharArrayPtr) ubuf , 0 , chars , chars , 1 ,
-        &chars , &style , &atsuLayout );
-
-    for ( int pos = 0; pos < (int)chars; pos ++ )
+#if wxMAC_USE_ATSU_TEXT

     {
     {

-        unsigned long actualNumberOfBounds = 0;
-        ATSTrapezoid glyphBounds;
-
-        // We get a single bound, since the text should only require one. If it requires more, there is an issue
-        OSStatus result;
-        result = ATSUGetGlyphBounds( atsuLayout, 0, 0, kATSUFromTextBeginning, pos + 1,
-            kATSUseDeviceOrigins, 1, &glyphBounds, &actualNumberOfBounds );
-        if (result != noErr || actualNumberOfBounds != 1 )
-            return;
-
-        widths[pos] = FixedToInt( glyphBounds.upperRight.x - glyphBounds.upperLeft.x );
-        //unsigned char uch = s[i];
+        ATSUTextLayout atsuLayout;
+        wxMacUniCharBuffer unibuf( text );
+        UniCharCount chars = unibuf.GetChars();
+        
+        ATSUStyle style = (((wxMacCoreGraphicsFontData*)m_font.GetRefData())->GetATSUStyle());
+        ::ATSUCreateTextLayoutWithTextPtr( unibuf.GetBuffer() , 0 , chars , chars , 1 ,
+                                          &chars , &style , &atsuLayout );
+        
+        for ( int pos = 0; pos < (int)chars; pos ++ )
+        {
+            unsigned long actualNumberOfBounds = 0;
+            ATSTrapezoid glyphBounds;
+            
+            // We get a single bound, since the text should only require one. If it requires more, there is an issue
+            OSStatus result;
+            result = ATSUGetGlyphBounds( atsuLayout, 0, 0, kATSUFromTextBeginning, pos + 1,
+                                        kATSUseDeviceOrigins, 1, &glyphBounds, &actualNumberOfBounds );
+            if (result != noErr || actualNumberOfBounds != 1 )
+                return;
+            
+            widths[pos] = FixedToInt( glyphBounds.upperRight.x - glyphBounds.upperLeft.x );
+            //unsigned char uch = s[i];
+        }
+        
+        ::ATSUDisposeTextLayout(atsuLayout);

     }
     }

-
-    ::ATSUDisposeTextLayout(atsuLayout);
+#endif
+#if wxMAC_USE_CG_TEXT
+    // TODO core graphics text implementation here
+#endif

 }
 
 }
 

-void * wxMacCoreGraphicsContext::GetNativeContext() 
+void * wxMacCoreGraphicsContext::GetNativeContext()

 {
 {

-       return m_cgContext;
+    return m_cgContext;

 }
 
 // concatenates this transform with the current transform of this context
 }
 
 // concatenates this transform with the current transform of this context

-void wxMacCoreGraphicsContext::ConcatTransform( const wxGraphicsMatrix* matrix )
+void wxMacCoreGraphicsContext::ConcatTransform( const wxGraphicsMatrix& matrix )

 {
 {

+    if ( m_cgContext )
+        CGContextConcatCTM( m_cgContext, *(CGAffineTransform*) matrix.GetNativeMatrix());
+    else
+        m_windowTransform = CGAffineTransformConcat(m_windowTransform, *(CGAffineTransform*) matrix.GetNativeMatrix());

 }
 
 // sets the transform of this context
 }
 
 // sets the transform of this context

-void wxMacCoreGraphicsContext::SetTransform( const wxGraphicsMatrix* matrix )
+void wxMacCoreGraphicsContext::SetTransform( const wxGraphicsMatrix& matrix )

 {
 {

+    if ( m_cgContext )
+    {
+        CGAffineTransform transform = CGContextGetCTM( m_cgContext );
+        transform = CGAffineTransformInvert( transform ) ;
+        CGContextConcatCTM( m_cgContext, transform);
+        CGContextConcatCTM( m_cgContext, *(CGAffineTransform*) matrix.GetNativeMatrix());
+    }
+    else
+    {
+        m_windowTransform = *(CGAffineTransform*) matrix.GetNativeMatrix();
+    }

 }
 
 // gets the matrix of this context
 }
 
 // gets the matrix of this context

-void wxMacCoreGraphicsContext::GetTransform( wxGraphicsMatrix* matrix )
+wxGraphicsMatrix wxMacCoreGraphicsContext::GetTransform() const

 {
 {

+    wxGraphicsMatrix m = CreateMatrix();
+    *((CGAffineTransform*) m.GetNativeMatrix()) = ( m_cgContext == NULL ? m_windowTransform :
+        CGContextGetCTM( m_cgContext ));
+    return m;

 }
 
 //
 }
 
 //


@@ -1884,41 +2115,44 @@ public :
 
     virtual ~wxMacCoreGraphicsRenderer() {}
 
 
     virtual ~wxMacCoreGraphicsRenderer() {}
 

-       // Context
+    // Context

 
 

-       virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc);
-       
-       virtual wxGraphicsContext * CreateContextFromNativeContext( void * context );
+    virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc);
+    virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc);

 
 

-       virtual wxGraphicsContext * CreateContextFromNativeWindow( void * window );
+    virtual wxGraphicsContext * CreateContextFromNativeContext( void * context );

 
 

-       virtual wxGraphicsContext * CreateContext( wxWindow* window );
+    virtual wxGraphicsContext * CreateContextFromNativeWindow( void * window );

 
 

-       // Path
-       
-    virtual wxGraphicsPath * CreatePath();
+    virtual wxGraphicsContext * CreateContext( wxWindow* window );
+    
+    virtual wxGraphicsContext * CreateMeasuringContext();

 
 

-       // Matrix
-       
-       virtual wxGraphicsMatrix * CreateMatrix( wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0, 
-               wxDouble tx=0.0, wxDouble ty=0.0);
+    // Path

 
 

+    virtual wxGraphicsPath CreatePath();
+
+    // Matrix
+
+    virtual wxGraphicsMatrix CreateMatrix( wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0,
+        wxDouble tx=0.0, wxDouble ty=0.0);
+
+
+    virtual wxGraphicsPen CreatePen(const wxPen& pen) ;
+
+    virtual wxGraphicsBrush CreateBrush(const wxBrush& brush ) ;

 
 

-    virtual wxGraphicsPen* CreatePen(const wxPen& pen) ;
-    
-    virtual wxGraphicsBrush* CreateBrush(const wxBrush& brush ) ;
-    

     // sets the brush to a linear gradient, starting at (x1,y1) with color c1 to (x2,y2) with color c2
     // sets the brush to a linear gradient, starting at (x1,y1) with color c1 to (x2,y2) with color c2

-    virtual wxGraphicsBrush* CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, 
+    virtual wxGraphicsBrush CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2,

         const wxColour&c1, const wxColour&c2) ;
 
         const wxColour&c1, const wxColour&c2) ;
 

-    // sets the brush to a radial gradient originating at (xo,yc) with color oColor and ends on a circle around (xc,yc) 
+    // sets the brush to a radial gradient originating at (xo,yc) with color oColor and ends on a circle around (xc,yc)

     // with radius r and color cColor
     // with radius r and color cColor

-    virtual wxGraphicsBrush* CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
+    virtual wxGraphicsBrush CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,

         const wxColour &oColor, const wxColour &cColor) ;
 
    // sets the font
         const wxColour &oColor, const wxColour &cColor) ;
 
    // sets the font

-    virtual wxGraphicsFont* CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) ;
+    virtual wxGraphicsFont CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) ;

 
 private :
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacCoreGraphicsRenderer)
 
 private :
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacCoreGraphicsRenderer)


@@ -1934,12 +2168,29 @@ static wxMacCoreGraphicsRenderer gs_MacCoreGraphicsRenderer;
 
 wxGraphicsRenderer* wxGraphicsRenderer::GetDefaultRenderer()
 {
 
 wxGraphicsRenderer* wxGraphicsRenderer::GetDefaultRenderer()
 {

-       return &gs_MacCoreGraphicsRenderer;
+    return &gs_MacCoreGraphicsRenderer;

 }
 
 }
 

-wxGraphicsContext * wxMacCoreGraphicsRenderer::CreateContext( const wxWindowDC& dc)
+wxGraphicsContext * wxMacCoreGraphicsRenderer::CreateContext( const wxWindowDC& dc )

 {
 {

-   return new wxMacCoreGraphicsContext(this,(CGContextRef)dc.GetWindow()->MacGetCGContextRef() );
+    const wxDCImpl* impl = dc.GetImpl();
+    wxWindowDCImpl *win_impl = wxDynamicCast( impl, wxWindowDCImpl );
+    if (win_impl)
+        return new wxMacCoreGraphicsContext( this,
+           (CGContextRef)(win_impl->GetWindow()->MacGetCGContextRef()) );
+           
+    return NULL;
+}
+
+wxGraphicsContext * wxMacCoreGraphicsRenderer::CreateContext( const wxMemoryDC& dc )
+{
+    const wxDCImpl* impl = dc.GetImpl();
+    wxMemoryDCImpl *mem_impl = wxDynamicCast( impl, wxMemoryDCImpl );
+    if (mem_impl)
+        return new wxMacCoreGraphicsContext( this, 
+            (CGContextRef)(mem_impl->GetGraphicsContext()->GetNativeContext()) );
+            
+    return NULL;

 }
 
 wxGraphicsContext * wxMacCoreGraphicsRenderer::CreateContextFromNativeContext( void * context )
 }
 
 wxGraphicsContext * wxMacCoreGraphicsRenderer::CreateContextFromNativeContext( void * context )


@@ -1955,72 +2206,157 @@ wxGraphicsContext * wxMacCoreGraphicsRenderer::CreateContextFromNativeWindow( vo
 
 wxGraphicsContext * wxMacCoreGraphicsRenderer::CreateContext( wxWindow* window )
 {
 
 wxGraphicsContext * wxMacCoreGraphicsRenderer::CreateContext( wxWindow* window )
 {

-       return new wxMacCoreGraphicsContext(this, window );
+    return new wxMacCoreGraphicsContext(this, window );
+}
+
+wxGraphicsContext * wxMacCoreGraphicsRenderer::CreateMeasuringContext()
+{
+    return new wxMacCoreGraphicsContext(this);

 }
 
 // Path
 
 }
 
 // Path
 

-wxGraphicsPath * wxMacCoreGraphicsRenderer::CreatePath()
+wxGraphicsPath wxMacCoreGraphicsRenderer::CreatePath()

 {
 {

-       return new wxMacCoreGraphicsPath( this );
+    wxGraphicsPath m;
+    m.SetRefData( new wxMacCoreGraphicsPathData(this));
+    return m;

 }
 
 
 // Matrix
 
 }
 
 
 // Matrix
 

-wxGraphicsMatrix * wxMacCoreGraphicsRenderer::CreateMatrix( wxDouble a, wxDouble b, wxDouble c, wxDouble d, 
-       wxDouble tx, wxDouble ty)
-       
+wxGraphicsMatrix wxMacCoreGraphicsRenderer::CreateMatrix( wxDouble a, wxDouble b, wxDouble c, wxDouble d,
+    wxDouble tx, wxDouble ty)

 {
 {

-    wxMacCoreGraphicsMatrix* m = new wxMacCoreGraphicsMatrix( this );
-    m->Set( a,b,c,d,tx,ty ) ;
+    wxGraphicsMatrix m;
+    wxMacCoreGraphicsMatrixData* data = new wxMacCoreGraphicsMatrixData( this );
+    data->Set( a,b,c,d,tx,ty ) ;
+    m.SetRefData(data);

     return m;
 }
 
     return m;
 }
 

-wxGraphicsPen* wxMacCoreGraphicsRenderer::CreatePen(const wxPen& pen) 
+wxGraphicsPen wxMacCoreGraphicsRenderer::CreatePen(const wxPen& pen)

 {
     if ( !pen.Ok() || pen.GetStyle() == wxTRANSPARENT )
 {
     if ( !pen.Ok() || pen.GetStyle() == wxTRANSPARENT )

-        return NULL;
+        return wxNullGraphicsPen;

     else
     else

-        return new wxMacCoreGraphicsPen( this, pen );
+    {
+        wxGraphicsPen p;
+        p.SetRefData(new wxMacCoreGraphicsPenData( this, pen ));
+        return p;
+    }

 }
 
 }
 

-wxGraphicsBrush* wxMacCoreGraphicsRenderer::CreateBrush(const wxBrush& brush ) 
+wxGraphicsBrush wxMacCoreGraphicsRenderer::CreateBrush(const wxBrush& brush )

 {
     if ( !brush.Ok() || brush.GetStyle() == wxTRANSPARENT )
 {
     if ( !brush.Ok() || brush.GetStyle() == wxTRANSPARENT )

-        return NULL;
+        return wxNullGraphicsBrush;

     else
     else

-        return new wxMacCoreGraphicsBrush( this, brush );
+    {
+        wxGraphicsBrush p;
+        p.SetRefData(new wxMacCoreGraphicsBrushData( this, brush ));
+        return p;
+    }

 }
 
 // sets the brush to a linear gradient, starting at (x1,y1) with color c1 to (x2,y2) with color c2
 }
 
 // sets the brush to a linear gradient, starting at (x1,y1) with color c1 to (x2,y2) with color c2

-wxGraphicsBrush* wxMacCoreGraphicsRenderer::CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, 
-    const wxColour&c1, const wxColour&c2) 
+wxGraphicsBrush wxMacCoreGraphicsRenderer::CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2,
+    const wxColour&c1, const wxColour&c2)

 {
 {

-    wxMacCoreGraphicsBrush* brush = new wxMacCoreGraphicsBrush(this);
-    brush->CreateLinearGradientBrush(x1, y1, x2, y2, c1, c2);
-    return brush;
+    wxGraphicsBrush p;
+    wxMacCoreGraphicsBrushData* d = new wxMacCoreGraphicsBrushData( this );
+    d->CreateLinearGradientBrush(x1, y1, x2, y2, c1, c2);
+    p.SetRefData(d);
+    return p;

 }
 
 }
 

-// sets the brush to a radial gradient originating at (xo,yc) with color oColor and ends on a circle around (xc,yc) 
+// sets the brush to a radial gradient originating at (xo,yc) with color oColor and ends on a circle around (xc,yc)

 // with radius r and color cColor
 // with radius r and color cColor

-wxGraphicsBrush* wxMacCoreGraphicsRenderer::CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
-    const wxColour &oColor, const wxColour &cColor) 
+wxGraphicsBrush wxMacCoreGraphicsRenderer::CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
+    const wxColour &oColor, const wxColour &cColor)

 {
 {

-    wxMacCoreGraphicsBrush* brush = new wxMacCoreGraphicsBrush(this);
-    brush->CreateRadialGradientBrush(xo,yo,xc,yc,radius,oColor,cColor);
-    return brush;
+    wxGraphicsBrush p;
+    wxMacCoreGraphicsBrushData* d = new wxMacCoreGraphicsBrushData( this );
+    d->CreateRadialGradientBrush(xo,yo,xc,yc,radius,oColor,cColor);
+    p.SetRefData(d);
+    return p;

 }
 
 // sets the font
 }
 
 // sets the font

-wxGraphicsFont* wxMacCoreGraphicsRenderer::CreateFont( const wxFont &font , const wxColour &col ) 
+wxGraphicsFont wxMacCoreGraphicsRenderer::CreateFont( const wxFont &font , const wxColour &col )

 {
     if ( font.Ok() )
 {
     if ( font.Ok() )

-        return new wxMacCoreGraphicsFont( this , font, col );
+    {
+        wxGraphicsFont p;
+        p.SetRefData(new wxMacCoreGraphicsFontData( this , font, col ));
+        return p;
+    }

     else
     else

+        return wxNullGraphicsFont;
+}
+
+//
+// CoreGraphics Helper Methods
+//
+
+// Data Providers and Consumers
+
+size_t UMAPutBytesCFRefCallback( void *info, const void *bytes, size_t count )
+{
+    CFMutableDataRef data = (CFMutableDataRef) info;
+    if ( data )
+    {
+        CFDataAppendBytes( data, (const UInt8*) bytes, count );
+    }
+    return count;
+}
+
+void wxMacReleaseCFDataProviderCallback(void *info,
+                                      const void *WXUNUSED(data),
+                                      size_t WXUNUSED(count))
+{
+    if ( info )
+        CFRelease( (CFDataRef) info );
+}
+
+void wxMacReleaseCFDataConsumerCallback( void *info )
+{
+    if ( info )
+        CFRelease( (CFDataRef) info );
+}
+
+CGDataProviderRef wxMacCGDataProviderCreateWithCFData( CFDataRef data )
+{
+    if ( data == NULL )
+        return NULL;
+
+    return CGDataProviderCreateWithCFData( data );
+}
+
+CGDataConsumerRef wxMacCGDataConsumerCreateWithCFData( CFMutableDataRef data )
+{
+    if ( data == NULL )

         return NULL;
         return NULL;

+
+    return CGDataConsumerCreateWithCFData( data );

 }
 
 }
 

+void wxMacReleaseMemoryBufferProviderCallback(void *info, const void *data, size_t WXUNUSED(size))
+{
+    wxMemoryBuffer* membuf = (wxMemoryBuffer*) info ;

 
 

+    wxASSERT( data == membuf->GetData() ) ;

 
 

-#endif // wxMAC_USE_CORE_GRAPHICS
+    delete membuf ;
+}
+
+CGDataProviderRef wxMacCGDataProviderCreateWithMemoryBuffer( const wxMemoryBuffer& buf )
+{
+    wxMemoryBuffer* b = new wxMemoryBuffer( buf );
+    if ( b->GetDataLen() == 0 )
+        return NULL;
+        
+    return CGDataProviderCreateWithData( b , (const void *) b->GetData() , b->GetDataLen() ,
+                                                 wxMacReleaseMemoryBufferProviderCallback );
+}
\ No newline at end of file