X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83576e682dd00c5ff68c3daafbdee54ce881cc83..ce7208d49d5ce2ca1dc0b3b83f14f1d04f29c4bf:/src/msw/graphics.cpp

diff --git a/src/msw/graphics.cpp b/src/msw/graphics.cpp
index acbbcd7593..4e847c1897 100644
--- a/src/msw/graphics.cpp
+++ b/src/msw/graphics.cpp
@@ -92,14 +92,13 @@ static inline double RadToDeg(double deg) { return (deg * 180.0) / M_PI; }
 #include "gdiplus.h"
 using namespace Gdiplus;
 
-class WXDLLIMPEXP_CORE wxGDIPlusPath : public wxGraphicsPath
+class WXDLLIMPEXP_CORE wxGDIPlusPathData : public wxGraphicsPathData
 {
 public :
-    wxGDIPlusPath();
-    wxGDIPlusPath(wxGraphicsRenderer* renderer, GraphicsPath* path = NULL);
-    ~wxGDIPlusPath();
+    wxGDIPlusPathData(wxGraphicsRenderer* renderer, GraphicsPath* path = NULL);
+    ~wxGDIPlusPathData();
 
-    virtual wxGraphicsPath *Clone() const;
+    virtual wxGraphicsObjectRefData *Clone() const;
 
     //
     // These are the path primitives from which everything else can be constructed
@@ -119,10 +118,10 @@ public :
     virtual void AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise ) ;
 
     // 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 another path
-    virtual void AddPath( const wxGraphicsPath* path );
+    virtual void AddPath( const wxGraphicsPathData* path );
 
     // closes the current sub-path
     virtual void CloseSubpath();
@@ -147,36 +146,30 @@ public :
 	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(path)) {}
+	virtual void UnGetNativePath(void * WXUNUSED(path)) const {}
 
     // transforms each point of this path by the matrix
-    virtual void Transform( wxGraphicsMatrix* 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 *h) ;
+    virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const;
 
-    virtual bool Contains( wxDouble x, wxDouble y, int fillStyle = wxWINDING_RULE) ;
+    virtual bool Contains( wxDouble x, wxDouble y, int fillStyle = wxODDEVEN_RULE) const;
 
 private :
     GraphicsPath* m_path;
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGDIPlusPath)
 };
 
-class WXDLLIMPEXP_CORE wxGDIPlusMatrix : public wxGraphicsMatrix
+class WXDLLIMPEXP_CORE wxGDIPlusMatrixData : public wxGraphicsMatrixData
 {
 public :
-    wxGDIPlusMatrix() ;
+    wxGDIPlusMatrixData(wxGraphicsRenderer* renderer, Matrix* matrix = NULL) ;
+    virtual ~wxGDIPlusMatrixData() ;
 
-    wxGDIPlusMatrix(wxGraphicsRenderer* renderer, Matrix* matrix = NULL ) ;
-    virtual ~wxGDIPlusMatrix() ;
-
-    virtual wxGraphicsMatrix *Clone() const ;
+    virtual wxGraphicsObjectRefData* Clone() const ;
 
     // concatenates the matrix
-    virtual void Concat( const wxGraphicsMatrix *t );
-
-    // copies the passed in matrix
-    virtual void Copy( const wxGraphicsMatrix *t );
+    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, 
@@ -186,10 +179,10 @@ public :
     virtual void Invert();
 
     // returns true if the elements of the transformation matrix are equal ?
-    virtual bool IsEqual( const wxGraphicsMatrix* t) const ;
+    virtual bool IsEqual( const wxGraphicsMatrixData* t) const ;
 
     // return true if this is the identity matrix
-    virtual bool IsIdentity();
+    virtual bool IsIdentity() const;
 
     //
     // transformation
@@ -209,29 +202,25 @@ public :
     //
 
     // applies that matrix to the point
-    virtual void TransformPoint( wxDouble *x, wxDouble *y );
+    virtual void TransformPoint( wxDouble *x, wxDouble *y ) const;
 
     // applies the matrix except for translations
-    virtual void TransformDistance( wxDouble *dx, wxDouble *dy );
+    virtual void TransformDistance( wxDouble *dx, wxDouble *dy ) const;
 
     // returns the native representation
     virtual void * GetNativeMatrix() const;
 private:
     Matrix* m_matrix ;
-
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGDIPlusMatrix)
 } ;
 
-class WXDLLIMPEXP_CORE wxGDIPlusPen : public wxGraphicsPen
+class WXDLLIMPEXP_CORE wxGDIPlusPenData : public wxGraphicsObjectRefData
 {
 public:
-    wxGDIPlusPen();
-    wxGDIPlusPen( wxGraphicsRenderer* renderer, const wxPen &pen );
-    ~wxGDIPlusPen();
+    wxGDIPlusPenData( wxGraphicsRenderer* renderer, const wxPen &pen );
+    ~wxGDIPlusPenData();
 
     void Init();
 
-    virtual void Apply( wxGraphicsContext* context );
     virtual wxDouble GetWidth() { return m_width; }
     virtual Pen* GetGDIPlusPen() { return m_pen; }
 
@@ -241,19 +230,15 @@ protected :
     Brush* m_penBrush;
 
     wxDouble m_width;
-private :
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGDIPlusPen)
 };
 
-class WXDLLIMPEXP_CORE wxGDIPlusBrush : public wxGraphicsBrush
+class WXDLLIMPEXP_CORE wxGDIPlusBrushData : public wxGraphicsObjectRefData
 {
 public:
-    wxGDIPlusBrush();
-    wxGDIPlusBrush( wxGraphicsRenderer* renderer );
-    wxGDIPlusBrush( wxGraphicsRenderer* renderer, const wxBrush &brush );
-    ~wxGDIPlusBrush ();
+    wxGDIPlusBrushData( wxGraphicsRenderer* renderer );
+    wxGDIPlusBrushData( wxGraphicsRenderer* renderer, const wxBrush &brush );
+    ~wxGDIPlusBrushData ();
 
-    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,
@@ -267,25 +252,19 @@ private :
     Brush* m_brush;
     Image* m_brushImage;
     GraphicsPath* m_brushPath;
-
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGDIPlusBrush)
 };
 
-class wxGDIPlusFont : public wxGraphicsFont
+class WXDLLIMPEXP_CORE wxGDIPlusFontData : public wxGraphicsObjectRefData
 {
 public:
-    wxGDIPlusFont();
-    wxGDIPlusFont( wxGraphicsRenderer* renderer, const wxFont &font, const wxColour& col );
-    ~wxGDIPlusFont();
+    wxGDIPlusFontData( wxGraphicsRenderer* renderer, const wxFont &font, const wxColour& col );
+    ~wxGDIPlusFontData();
 
-    virtual void Apply( wxGraphicsContext* context );
     virtual Brush* GetGDIPlusBrush() { return m_textBrush; }
     virtual Font* GetGDIPlusFont() { return m_font; }
 private :
     Brush* m_textBrush;
     Font* m_font;
-
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGDIPlusFont)
 };
 
 class WXDLLIMPEXP_CORE wxGDIPlusContext : public wxGraphicsContext
@@ -307,21 +286,21 @@ public:
 
 	virtual void * GetNativeContext();
 	
-    virtual void StrokePath( const wxGraphicsPath *p );
-    virtual void FillPath( const wxGraphicsPath *p , int fillStyle = wxWINDING_RULE );
+    virtual void StrokePath( const wxGraphicsPath& p );
+    virtual void FillPath( const wxGraphicsPath& p , int fillStyle = wxODDEVEN_RULE );
 
     virtual void Translate( wxDouble dx , wxDouble dy );    
     virtual void Scale( wxDouble xScale , wxDouble yScale );    
     virtual void Rotate( wxDouble angle );    
 
     // concatenates this transform with the current transform of this context
-    virtual void ConcatTransform( const wxGraphicsMatrix* matrix );
+    virtual void ConcatTransform( const wxGraphicsMatrix& matrix );
 
     // sets the transform of this context
-    virtual void SetTransform( const wxGraphicsMatrix* matrix );
+    virtual void SetTransform( const wxGraphicsMatrix& matrix );
 
     // gets the matrix of this context
-    virtual void GetTransform( wxGraphicsMatrix* matrix );
+    virtual wxGraphicsMatrix GetTransform() const;
 
     virtual void DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h );
     virtual void DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h );
@@ -349,29 +328,22 @@ private:
 // wxGDIPlusPen implementation
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxGDIPlusPen,wxGraphicsPen)
-
-wxGDIPlusPen::wxGDIPlusPen() : wxGraphicsPen(NULL)
-{
-    wxLogDebug(wxT("Illegal Constructor called"));
-}
-
-wxGDIPlusPen::~wxGDIPlusPen()
+wxGDIPlusPenData::~wxGDIPlusPenData()
 {
     delete m_pen;
     delete m_penImage;
     delete m_penBrush;
 }
 
-void wxGDIPlusPen::Init()
+void wxGDIPlusPenData::Init()
 {
     m_pen = NULL ;
     m_penImage = NULL;
     m_penBrush = NULL;
 }
 
-wxGDIPlusPen::wxGDIPlusPen( wxGraphicsRenderer* renderer, const wxPen &pen )
-: wxGraphicsPen(renderer)
+wxGDIPlusPenData::wxGDIPlusPenData( wxGraphicsRenderer* renderer, const wxPen &pen )
+: wxGraphicsObjectRefData(renderer)
 {    
     Init();
     m_width = pen.GetWidth();
@@ -512,33 +484,18 @@ wxGDIPlusPen::wxGDIPlusPen( wxGraphicsRenderer* renderer, const wxPen &pen )
         m_pen->SetDashStyle(dashStyle);
 }
 
-void wxGDIPlusPen::Apply( wxGraphicsContext* WXUNUSED(context) )
-{
-    // nothing to do here
-}
-
-
 //-----------------------------------------------------------------------------
 // wxGDIPlusBrush implementation
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxGDIPlusBrush,wxGraphicsBrush)
-
-wxGDIPlusBrush::wxGDIPlusBrush( wxGraphicsRenderer* renderer )
-: wxGraphicsBrush(renderer)
+wxGDIPlusBrushData::wxGDIPlusBrushData( wxGraphicsRenderer* renderer )
+: wxGraphicsObjectRefData(renderer)
 {
     Init();
 }
 
-wxGDIPlusBrush::wxGDIPlusBrush( )
-: wxGraphicsBrush(NULL)
-{
-    wxLogDebug(wxT("Illegal Constructor called"));
-}
-
-
-wxGDIPlusBrush::wxGDIPlusBrush( wxGraphicsRenderer* renderer , const wxBrush &brush )
-: wxGraphicsBrush(renderer)
+wxGDIPlusBrushData::wxGDIPlusBrushData( wxGraphicsRenderer* renderer , const wxBrush &brush )
+: wxGraphicsObjectRefData(renderer)
 {
     Init();
     if ( brush.GetStyle() == wxSOLID)
@@ -586,28 +543,28 @@ wxGDIPlusBrush::wxGDIPlusBrush( wxGraphicsRenderer* renderer , const wxBrush &br
     }
 }
 
-wxGDIPlusBrush::~wxGDIPlusBrush()
+wxGDIPlusBrushData::~wxGDIPlusBrushData()
 {
     delete m_brush;
     delete m_brushImage;
     delete m_brushPath;
 };
 
-void wxGDIPlusBrush::Init()
+void wxGDIPlusBrushData::Init()
 {
     m_brush = NULL;
     m_brushImage= NULL;
     m_brushPath= NULL;
 }
 
-void wxGDIPlusBrush::CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, const wxColour&c1, const wxColour&c2) 
+void wxGDIPlusBrushData::CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, const wxColour&c1, const wxColour&c2) 
 {
     m_brush = new LinearGradientBrush( PointF( x1,y1) , PointF( x2,y2),
         Color( c1.Alpha(), c1.Red(),c1.Green() , c1.Blue() ),
         Color( c2.Alpha(), c2.Red(),c2.Green() , c2.Blue() ));
 }
 
-void wxGDIPlusBrush::CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
+void wxGDIPlusBrushData::CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
                                                const wxColour &oColor, const wxColour &cColor)
 {
     // Create a path that consists of a single circle.
@@ -624,24 +581,12 @@ void wxGDIPlusBrush::CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDoub
     b->SetSurroundColors(colors, &count);
 }
 
-void wxGDIPlusBrush::Apply( wxGraphicsContext* WXUNUSED(context) )
-{
-    // nothing to do here
-}
-
 //-----------------------------------------------------------------------------
 // wxGDIPlusFont implementation
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxGDIPlusFont,wxGraphicsFont)
-
-wxGDIPlusFont::wxGDIPlusFont() : wxGraphicsFont( NULL )
-{
-    wxLogDebug(wxT("Illegal Constructor called"));
-}
-
-wxGDIPlusFont::wxGDIPlusFont( wxGraphicsRenderer* renderer, const wxFont &font, 
-                             const wxColour& col ) : wxGraphicsFont( renderer )
+wxGDIPlusFontData::wxGDIPlusFontData( wxGraphicsRenderer* renderer, const wxFont &font, 
+                             const wxColour& col ) : wxGraphicsObjectRefData( renderer )
 {
     m_textBrush = NULL;
     m_font = NULL;
@@ -660,24 +605,17 @@ wxGDIPlusFont::wxGDIPlusFont( wxGraphicsRenderer* renderer, const wxFont &font,
         col.Green() , col.Blue() ));
 }
 
-wxGDIPlusFont::~wxGDIPlusFont()
+wxGDIPlusFontData::~wxGDIPlusFontData()
 {
     delete m_textBrush;
     delete m_font;
 }
 
-void wxGDIPlusFont::Apply( wxGraphicsContext* WXUNUSED(context) )
-{
-    // nothing to do here
-}
-
 //-----------------------------------------------------------------------------
 // wxGDIPlusPath implementation
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxGDIPlusPath,wxGraphicsPath)
-
-wxGDIPlusPath::wxGDIPlusPath(wxGraphicsRenderer* renderer, GraphicsPath* path ) : wxGraphicsPath(renderer)
+wxGDIPlusPathData::wxGDIPlusPathData(wxGraphicsRenderer* renderer, GraphicsPath* path ) : wxGraphicsPathData(renderer)
 {
     if ( path )
         m_path = path;
@@ -685,45 +623,37 @@ wxGDIPlusPath::wxGDIPlusPath(wxGraphicsRenderer* renderer, GraphicsPath* path )
         m_path = new GraphicsPath();
 }
 
-wxGDIPlusPath::wxGDIPlusPath() : wxGraphicsPath(NULL)
-{
-    wxLogDebug(wxT("Illegal Constructor called"));
-}
-
-
-wxGDIPlusPath::~wxGDIPlusPath()
+wxGDIPlusPathData::~wxGDIPlusPathData()
 {
     delete m_path;
 }
 
-wxGraphicsPath* wxGDIPlusPath::Clone() const
+wxGraphicsObjectRefData* wxGDIPlusPathData::Clone() const
 {
-    return new wxGDIPlusPath( GetRenderer() , m_path->Clone());
+    return new wxGDIPlusPathData( GetRenderer() , m_path->Clone());
 }
 
-
-
 //
 // The Primitives
 //
 
-void wxGDIPlusPath::MoveToPoint( wxDouble x , wxDouble y )
+void wxGDIPlusPathData::MoveToPoint( wxDouble x , wxDouble y )
 {
     m_path->StartFigure();
     m_path->AddLine((REAL) x,(REAL) y,(REAL) x,(REAL) y);
 }
 
-void wxGDIPlusPath::AddLineToPoint( wxDouble x , wxDouble y )
+void wxGDIPlusPathData::AddLineToPoint( wxDouble x , wxDouble y )
 {
     m_path->AddLine((REAL) x,(REAL) y,(REAL) x,(REAL) y);
 }
 
-void wxGDIPlusPath::CloseSubpath()
+void wxGDIPlusPathData::CloseSubpath()
 {
     m_path->CloseFigure();
 }
 
-void wxGDIPlusPath::AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y )
+void wxGDIPlusPathData::AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y )
 {
     PointF c1(cx1,cy1);
     PointF c2(cx2,cy2);
@@ -734,15 +664,15 @@ void wxGDIPlusPath::AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, w
 }
 
 // gets the last point of the current path, (0,0) if not yet set
-void wxGDIPlusPath::GetCurrentPoint( wxDouble& x, wxDouble&y) 
+void wxGDIPlusPathData::GetCurrentPoint( wxDouble* x, wxDouble* y) const
 {
     PointF start;
     m_path->GetLastPoint(&start);
-    x = start.X ;
-    y = start.Y ;
+    *x = start.X ;
+    *y = start.Y ;
 }
 
-void wxGDIPlusPath::AddArc( wxDouble x, wxDouble y, wxDouble r, double startAngle, double endAngle, bool clockwise ) 
+void wxGDIPlusPathData::AddArc( wxDouble x, wxDouble y, wxDouble r, double startAngle, double endAngle, bool clockwise ) 
 {
     double sweepAngle = endAngle - startAngle ;
     if( abs(sweepAngle) >= 2*M_PI)
@@ -766,25 +696,25 @@ void wxGDIPlusPath::AddArc( wxDouble x, wxDouble y, wxDouble r, double startAngl
    m_path->AddArc((REAL) (x-r),(REAL) (y-r),(REAL) (2*r),(REAL) (2*r),RadToDeg(startAngle),RadToDeg(sweepAngle)); 
 }
 
-void wxGDIPlusPath::AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h )
+void wxGDIPlusPathData::AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h )
 {
     m_path->AddRectangle(RectF(x,y,w,h));
 }
 
-void wxGDIPlusPath::AddPath( const wxGraphicsPath* path )
+void wxGDIPlusPathData::AddPath( const wxGraphicsPathData* path )
 {
     m_path->AddPath( (GraphicsPath*) path->GetNativePath(), FALSE);
 }
 
 
 // transforms each point of this path by the matrix
-void wxGDIPlusPath::Transform( wxGraphicsMatrix* matrix ) 
+void wxGDIPlusPathData::Transform( const wxGraphicsMatrixData* matrix ) 
 {
     m_path->Transform( (Matrix*) matrix->GetNativeMatrix() );
 }
 
 // gets the bounding box enclosing all points (possibly including control points)
-void wxGDIPlusPath::GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) 
+void wxGDIPlusPathData::GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const
 {
     RectF bounds;
     m_path->GetBounds( &bounds, NULL, NULL) ;
@@ -794,25 +724,18 @@ void wxGDIPlusPath::GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h)
     *h = bounds.Height;
 }
 
-bool wxGDIPlusPath::Contains( wxDouble x, wxDouble y, int fillStyle ) 
+bool wxGDIPlusPathData::Contains( wxDouble x, wxDouble y, int fillStyle ) const
 {
     m_path->SetFillMode( fillStyle == wxODDEVEN_RULE ? FillModeAlternate : FillModeWinding);
     return m_path->IsVisible( (FLOAT) x,(FLOAT) y) == TRUE ;
 }
 
 //-----------------------------------------------------------------------------
-// wxGDIPlusMatrix implementation
+// wxGDIPlusMatrixData implementation
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxGDIPlusMatrix,wxGraphicsMatrix)
-
-wxGDIPlusMatrix::wxGDIPlusMatrix() : wxGraphicsMatrix(NULL)
-{
-    wxLogDebug(wxT("Illegal Constructor called"));
-}
-
-wxGDIPlusMatrix::wxGDIPlusMatrix(wxGraphicsRenderer* renderer, Matrix* matrix )
-    : wxGraphicsMatrix(renderer)
+wxGDIPlusMatrixData::wxGDIPlusMatrixData(wxGraphicsRenderer* renderer, Matrix* matrix )
+    : wxGraphicsMatrixData(renderer)
 {
     if ( matrix )
         m_matrix = matrix ;
@@ -820,50 +743,43 @@ wxGDIPlusMatrix::wxGDIPlusMatrix(wxGraphicsRenderer* renderer, Matrix* matrix )
         m_matrix = new Matrix();
 }
 
-wxGDIPlusMatrix::~wxGDIPlusMatrix() 
+wxGDIPlusMatrixData::~wxGDIPlusMatrixData() 
 {
     delete m_matrix;
 }
 
-wxGraphicsMatrix *wxGDIPlusMatrix::Clone() const 
+wxGraphicsObjectRefData *wxGDIPlusMatrixData::Clone() const 
 {
-    return new wxGDIPlusMatrix( GetRenderer(), m_matrix->Clone());
+    return new wxGDIPlusMatrixData( GetRenderer(), m_matrix->Clone());
 }
 
 // concatenates the matrix
-void wxGDIPlusMatrix::Concat( const wxGraphicsMatrix *t )
+void wxGDIPlusMatrixData::Concat( const wxGraphicsMatrixData *t )
 {
     m_matrix->Multiply( (Matrix*) t->GetNativeMatrix());
 }
 
-// copies the passed in matrix
-void wxGDIPlusMatrix::Copy( const wxGraphicsMatrix *t )
-{
-    delete m_matrix;
-    m_matrix = ((Matrix*) t->GetNativeMatrix())->Clone();
-}
-
 // sets the matrix to the respective values
-void wxGDIPlusMatrix::Set(wxDouble a, wxDouble b, wxDouble c, wxDouble d, 
+void wxGDIPlusMatrixData::Set(wxDouble a, wxDouble b, wxDouble c, wxDouble d, 
                  wxDouble tx, wxDouble ty)
 {
     m_matrix->SetElements(a,b,c,d,tx,ty);
 }
 
 // makes this the inverse matrix
-void wxGDIPlusMatrix::Invert()
+void wxGDIPlusMatrixData::Invert()
 {
     m_matrix->Invert();
 }
 
 // returns true if the elements of the transformation matrix are equal ?
-bool wxGDIPlusMatrix::IsEqual( const wxGraphicsMatrix* t) const 
+bool wxGDIPlusMatrixData::IsEqual( const wxGraphicsMatrixData* t) const 
 {
     return m_matrix->Equals((Matrix*) t->GetNativeMatrix())== TRUE ;
 }
 
 // return true if this is the identity matrix
-bool wxGDIPlusMatrix::IsIdentity()
+bool wxGDIPlusMatrixData::IsIdentity() const
 {
     return m_matrix->IsIdentity() == TRUE ;
 }
@@ -873,19 +789,19 @@ bool wxGDIPlusMatrix::IsIdentity()
 //
 
 // add the translation to this matrix
-void wxGDIPlusMatrix::Translate( wxDouble dx , wxDouble dy )
+void wxGDIPlusMatrixData::Translate( wxDouble dx , wxDouble dy )
 {
     m_matrix->Translate(dx,dy);
 }
 
 // add the scale to this matrix
-void wxGDIPlusMatrix::Scale( wxDouble xScale , wxDouble yScale )
+void wxGDIPlusMatrixData::Scale( wxDouble xScale , wxDouble yScale )
 {
     m_matrix->Scale(xScale,yScale);
 }
 
 // add the rotation to this matrix (radians)
-void wxGDIPlusMatrix::Rotate( wxDouble angle )
+void wxGDIPlusMatrixData::Rotate( wxDouble angle )
 {
     m_matrix->Rotate( angle );
 }
@@ -895,7 +811,7 @@ void wxGDIPlusMatrix::Rotate( wxDouble angle )
 //
 
 // applies that matrix to the point
-void wxGDIPlusMatrix::TransformPoint( wxDouble *x, wxDouble *y )
+void wxGDIPlusMatrixData::TransformPoint( wxDouble *x, wxDouble *y ) const
 {
     PointF pt(*x,*y);
     m_matrix->TransformPoints(&pt);
@@ -904,7 +820,7 @@ void wxGDIPlusMatrix::TransformPoint( wxDouble *x, wxDouble *y )
 }
 
 // applies the matrix except for translations
-void wxGDIPlusMatrix::TransformDistance( wxDouble *dx, wxDouble *dy )
+void wxGDIPlusMatrixData::TransformDistance( wxDouble *dx, wxDouble *dy ) const
 {
     PointF pt(*dx,*dy);
     m_matrix->TransformVectors(&pt);
@@ -913,7 +829,7 @@ void wxGDIPlusMatrix::TransformDistance( wxDouble *dx, wxDouble *dy )
 }
 
 // returns the native representation
-void * wxGDIPlusMatrix::GetNativeMatrix() const
+void * wxGDIPlusMatrixData::GetNativeMatrix() const
 {
     return m_matrix;
 }
@@ -969,10 +885,6 @@ void wxGDIPlusContext::SetDefaults()
 
 wxGDIPlusContext::~wxGDIPlusContext()
 {
-    SetBrush(NULL);
-    SetFont(NULL);
-    SetPen(NULL);
-
     if ( m_context )
     {
         m_context->Restore( m_state2 );
@@ -997,21 +909,21 @@ void wxGDIPlusContext::ResetClip()
     m_context->ResetClip();
 }
 
-void wxGDIPlusContext::StrokePath( const wxGraphicsPath *path )
+void wxGDIPlusContext::StrokePath( const wxGraphicsPath& path )
 {
-    if ( m_pen )
+    if ( !m_pen.IsNull() )
     {
-        m_context->DrawPath( ((wxGDIPlusPen*)m_pen)->GetGDIPlusPen() , (GraphicsPath*) path->GetNativePath() );
+        m_context->DrawPath( ((wxGDIPlusPenData*)m_pen.GetGraphicsData())->GetGDIPlusPen() , (GraphicsPath*) path.GetNativePath() );
     }
 }
 
-void wxGDIPlusContext::FillPath( const wxGraphicsPath *path , int fillStyle )
+void wxGDIPlusContext::FillPath( const wxGraphicsPath& path , int fillStyle )
 {
-    if ( m_brush )
+    if ( !m_brush.IsNull() )
     {
-        ((GraphicsPath*) path->GetNativePath())->SetFillMode( fillStyle == wxODDEVEN_RULE ? FillModeAlternate : FillModeWinding);
-        m_context->FillPath( ((wxGDIPlusBrush*)m_brush)->GetGDIPlusBrush() , 
-            (GraphicsPath*) path->GetNativePath());
+        ((GraphicsPath*) path.GetNativePath())->SetFillMode( fillStyle == wxODDEVEN_RULE ? FillModeAlternate : FillModeWinding);
+        m_context->FillPath( ((wxGDIPlusBrushData*)m_brush.GetRefData())->GetGDIPlusBrush() , 
+            (GraphicsPath*) path.GetNativePath());
     }
 }
 
@@ -1173,15 +1085,14 @@ void wxGDIPlusContext::DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxD
     DeleteObject(iconInfo.hbmMask);
 }
 
-
 void wxGDIPlusContext::DrawText( const wxString &str, wxDouble x, wxDouble y ) 
 {
-    if ( str.IsEmpty())
+    if ( m_font.IsNull() || str.IsEmpty())
         return ;
 
     wxWCharBuffer s = str.wc_str( *wxConvUI );
-    m_context->DrawString( s , -1 , ((wxGDIPlusFont*)m_font)->GetGDIPlusFont() , 
-            PointF( x , y ) , ((wxGDIPlusFont*)m_font)->GetGDIPlusBrush() );
+    m_context->DrawString( s , -1 , ((wxGDIPlusFontData*)m_font.GetRefData())->GetGDIPlusFont() , 
+            PointF( x , y ) , ((wxGDIPlusFontData*)m_font.GetRefData())->GetGDIPlusBrush() );
     // TODO m_backgroundMode == wxSOLID
 }
 
@@ -1190,7 +1101,7 @@ void wxGDIPlusContext::GetTextExtent( const wxString &str, wxDouble *width, wxDo
 {
     wxWCharBuffer s = str.wc_str( *wxConvUI );
     FontFamily ffamily ;
-    Font* f = ((wxGDIPlusFont*)m_font)->GetGDIPlusFont();
+    Font* f = ((wxGDIPlusFontData*)m_font.GetRefData())->GetGDIPlusFont();
     
     f->GetFamily(&ffamily) ;
 
@@ -1240,7 +1151,7 @@ void wxGDIPlusContext::GetPartialTextExtents(const wxString& text, wxArrayDouble
     if (text.empty())
         return;
 
-    Font* f = ((wxGDIPlusFont*)m_font)->GetGDIPlusFont();
+    Font* f = ((wxGDIPlusFontData*)m_font.GetRefData())->GetGDIPlusFont();
     wxWCharBuffer ws = text.wc_str( *wxConvUI );
     size_t len = wcslen( ws ) ;
     wxASSERT_MSG(text.length() == len , wxT("GetPartialTextExtents not yet implemented for multichar situations"));
@@ -1272,21 +1183,23 @@ void* wxGDIPlusContext::GetNativeContext()
 }
 
 // concatenates this transform with the current transform of this context
-void wxGDIPlusContext::ConcatTransform( const wxGraphicsMatrix* matrix )
+void wxGDIPlusContext::ConcatTransform( const wxGraphicsMatrix& matrix )
 {
-    m_context->MultiplyTransform((Matrix*) matrix->GetNativeMatrix());
+    m_context->MultiplyTransform((Matrix*) matrix.GetNativeMatrix());
 }
 
 // sets the transform of this context
-void wxGDIPlusContext::SetTransform( const wxGraphicsMatrix* matrix )
+void wxGDIPlusContext::SetTransform( const wxGraphicsMatrix& matrix )
 {
-    m_context->SetTransform((Matrix*) matrix->GetNativeMatrix());
+    m_context->SetTransform((Matrix*) matrix.GetNativeMatrix());
 }
 
 // gets the matrix of this context
-void wxGDIPlusContext::GetTransform( wxGraphicsMatrix* matrix )
+wxGraphicsMatrix wxGDIPlusContext::GetTransform() const
 {
-    m_context->GetTransform((Matrix*) matrix->GetNativeMatrix());
+    wxGraphicsMatrix matrix = CreateMatrix();
+    m_context->GetTransform((Matrix*) matrix.GetNativeMatrix());
+    return matrix;
 }
 //-----------------------------------------------------------------------------
 // wxGDIPlusRenderer declaration
@@ -1321,29 +1234,29 @@ public :
 
     // Path
 
-    virtual wxGraphicsPath * CreatePath();
+    virtual wxGraphicsPath CreatePath();
 
     // Matrix
 
-    virtual wxGraphicsMatrix * CreateMatrix( wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0, 
+    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 wxGraphicsPen CreatePen(const wxPen& pen) ;
 
-    virtual wxGraphicsBrush* CreateBrush(const wxBrush& brush ) ;
+    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
-    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) ;
 
     // 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
-    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
-    virtual wxGraphicsFont* CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) ;
+    virtual wxGraphicsFont CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) ;
 protected :
     void EnsureIsLoaded();
     void Load();
@@ -1418,72 +1331,92 @@ wxGraphicsContext * wxGDIPlusRenderer::CreateContext( wxWindow* window )
 
 // Path
 
-wxGraphicsPath * wxGDIPlusRenderer::CreatePath()
+wxGraphicsPath wxGDIPlusRenderer::CreatePath()
 {
     EnsureIsLoaded();
-    return new wxGDIPlusPath( this );
+    wxGraphicsPath m;
+    m.SetRefData( new wxGDIPlusPathData(this));
+    return m;
 }
 
 
 // Matrix
 
-wxGraphicsMatrix * wxGDIPlusRenderer::CreateMatrix( wxDouble a, wxDouble b, wxDouble c, wxDouble d, 
+wxGraphicsMatrix wxGDIPlusRenderer::CreateMatrix( wxDouble a, wxDouble b, wxDouble c, wxDouble d, 
                                                            wxDouble tx, wxDouble ty)
 
 {
     EnsureIsLoaded();
-    wxGDIPlusMatrix* m = new wxGDIPlusMatrix( this );
-    m->Set( a,b,c,d,tx,ty ) ;
+    wxGraphicsMatrix m;
+    wxGDIPlusMatrixData* data = new wxGDIPlusMatrixData( this );
+    data->Set( a,b,c,d,tx,ty ) ;
+    m.SetRefData(data);
     return m;
 }
 
-wxGraphicsPen* wxGDIPlusRenderer::CreatePen(const wxPen& pen) 
+wxGraphicsPen wxGDIPlusRenderer::CreatePen(const wxPen& pen) 
 {
     EnsureIsLoaded();
     if ( !pen.Ok() || pen.GetStyle() == wxTRANSPARENT )
-        return NULL;
+        return wxNullGraphicsPen;
     else
-        return new wxGDIPlusPen( this, pen );
+    {
+        wxGraphicsPen p;
+        p.SetRefData(new wxGDIPlusPenData( this, pen ));
+        return p;
+    }
 }
 
-wxGraphicsBrush* wxGDIPlusRenderer::CreateBrush(const wxBrush& brush ) 
+wxGraphicsBrush wxGDIPlusRenderer::CreateBrush(const wxBrush& brush ) 
 {
     EnsureIsLoaded();
     if ( !brush.Ok() || brush.GetStyle() == wxTRANSPARENT )
-        return NULL;
+        return wxNullGraphicsBrush;
     else
-        return new wxGDIPlusBrush( this, brush );
+    {
+        wxGraphicsBrush p;
+        p.SetRefData(new wxGDIPlusBrushData( this, brush ));
+        return p;
+    }
 }
 
 // sets the brush to a linear gradient, starting at (x1,y1) with color c1 to (x2,y2) with color c2
-wxGraphicsBrush* wxGDIPlusRenderer::CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, 
+wxGraphicsBrush wxGDIPlusRenderer::CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, 
                                                                       const wxColour&c1, const wxColour&c2) 
 {
     EnsureIsLoaded();
-    wxGDIPlusBrush* brush = new wxGDIPlusBrush(this);
-    brush->CreateLinearGradientBrush(x1, y1, x2, y2, c1, c2);
-    return brush;
-}
+    wxGraphicsBrush p;
+    wxGDIPlusBrushData* d = new wxGDIPlusBrushData( 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) 
 // with radius r and color cColor
-wxGraphicsBrush* wxGDIPlusRenderer::CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
+wxGraphicsBrush wxGDIPlusRenderer::CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
                                                                       const wxColour &oColor, const wxColour &cColor) 
 {
     EnsureIsLoaded();
-    wxGDIPlusBrush* brush = new wxGDIPlusBrush(this);
-    brush->CreateRadialGradientBrush(xo,yo,xc,yc,radius,oColor,cColor);
-    return brush;
+    wxGraphicsBrush p;
+    wxGDIPlusBrushData* d = new wxGDIPlusBrushData( this );
+    d->CreateRadialGradientBrush(xo,yo,xc,yc,radius,oColor,cColor);
+    p.SetRefData(d);
+    return p;
 }
 
 // sets the font
-wxGraphicsFont* wxGDIPlusRenderer::CreateFont( const wxFont &font , const wxColour &col ) 
+wxGraphicsFont wxGDIPlusRenderer::CreateFont( const wxFont &font , const wxColour &col ) 
 {
     EnsureIsLoaded();
     if ( font.Ok() )
-        return new wxGDIPlusFont( this , font, col );
+    {        
+        wxGraphicsFont p;
+        p.SetRefData(new wxGDIPlusFontData( this , font, col ));
+        return p;
+    }
     else
-        return NULL;
+        return wxNullGraphicsFont;
 }
 
 #endif  // wxUSE_GRAPHICS_CONTEXT