Minor header cleaning.

[wxWidgets.git] / src / msw / graphics.cpp

diff --git a/src/msw/graphics.cpp b/src/msw/graphics.cpp
index e6ac1418919d459a861e56d327db57e141e826e1..4e847c1897b3509924084db420de538b5524bec7 100644 (file)
--- a/src/msw/graphics.cpp
+++ b/src/msw/graphics.cpp
@@ -92,55 +92,13 @@ static inline double RadToDeg(double deg) { return (deg * 180.0) / M_PI; }
 #include "gdiplus.h"
 using namespace Gdiplus;
 
 #include "gdiplus.h"
 using namespace Gdiplus;
 

-class GDILoader
+class WXDLLIMPEXP_CORE wxGDIPlusPathData : public wxGraphicsPathData

 {
 public :
 {
 public :

-    GDILoader() 
-    {
-        m_loaded = false;
-        m_gditoken = NULL;
-    }
-
-    ~GDILoader()
-    {
-        if (m_loaded)
-        {
-            Unload();
-        }
-    }
-    void EnsureIsLoaded()
-    {
-        if (!m_loaded)
-        {
-            Load();
-        }
-    }
-    void Load()
-    {
-        GdiplusStartupInput input;
-        GdiplusStartupOutput output;
-        GdiplusStartup(&m_gditoken,&input,&output);
-        m_loaded = true;
-    }
-    void Unload()
-    {
-        if ( m_gditoken )
-            GdiplusShutdown(m_gditoken);
-    }
-private :
-    bool m_loaded;
-    DWORD m_gditoken;
-
-};
-
-static GDILoader gGDILoader;
-
-class WXDLLEXPORT wxGDIPlusPath : public wxGraphicsPath
-{
-public :
-    wxGDIPlusPath();
-    ~wxGDIPlusPath();
+    wxGDIPlusPathData(wxGraphicsRenderer* renderer, GraphicsPath* path = NULL);
+    ~wxGDIPlusPathData();

 
 

+    virtual wxGraphicsObjectRefData *Clone() const;

 
     //
     // These are the path primitives from which everything else can be constructed
 
     //
     // These are the path primitives from which everything else can be constructed


@@ -160,7 +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 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 wxGraphicsPathData* path );

 
     // closes the current sub-path
     virtual void CloseSubpath();
 
     // closes the current sub-path
     virtual void CloseSubpath();


@@ -185,19 +146,133 @@ public :
        virtual void * GetNativePath() const { return m_path; }
        
        // give the native path returned by GetNativePath() back (there might be some deallocations necessary)
        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( 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) const;
+
+    virtual bool Contains( wxDouble x, wxDouble y, int fillStyle = wxODDEVEN_RULE) const;

 
 private :
     GraphicsPath* m_path;
 
 private :
     GraphicsPath* m_path;

-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGDIPlusPath)

 };
 
 };
 

-class WXDLLEXPORT wxGDIPlusContext : public wxGraphicsContext
+class WXDLLIMPEXP_CORE wxGDIPlusMatrixData : public wxGraphicsMatrixData
+{
+public :
+    wxGDIPlusMatrixData(wxGraphicsRenderer* renderer, Matrix* matrix = NULL) ;
+    virtual ~wxGDIPlusMatrixData() ;
+
+    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);
+
+    // 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
+    //
+
+    // add the translation to this matrix
+    virtual void Translate( wxDouble dx , wxDouble dy );
+
+    // add the scale to this matrix
+    virtual void Scale( wxDouble xScale , wxDouble yScale );
+
+    // add the rotation to this matrix (radians)
+    virtual void Rotate( wxDouble angle );     
+
+    //
+    // apply the transforms
+    //
+
+    // 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:
+    Matrix* m_matrix ;
+} ;
+
+class WXDLLIMPEXP_CORE wxGDIPlusPenData : public wxGraphicsObjectRefData
+{
+public:
+    wxGDIPlusPenData( wxGraphicsRenderer* renderer, const wxPen &pen );
+    ~wxGDIPlusPenData();
+
+    void Init();
+
+    virtual wxDouble GetWidth() { return m_width; }
+    virtual Pen* GetGDIPlusPen() { return m_pen; }
+
+protected :
+    Pen* m_pen;
+    Image* m_penImage;
+    Brush* m_penBrush;
+
+    wxDouble m_width;
+};
+
+class WXDLLIMPEXP_CORE wxGDIPlusBrushData : public wxGraphicsObjectRefData
+{
+public:
+    wxGDIPlusBrushData( wxGraphicsRenderer* renderer );
+    wxGDIPlusBrushData( wxGraphicsRenderer* renderer, const wxBrush &brush );
+    ~wxGDIPlusBrushData ();
+
+    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 Brush* GetGDIPlusBrush() { return m_brush; }
+
+protected:
+    virtual void Init();
+
+private :
+    Brush* m_brush;
+    Image* m_brushImage;
+    GraphicsPath* m_brushPath;
+};
+
+class WXDLLIMPEXP_CORE wxGDIPlusFontData : public wxGraphicsObjectRefData

 {
 public:
 {
 public:

-    wxGDIPlusContext( HDC hdc );
-    wxGDIPlusContext( HWND hwnd );
-    wxGDIPlusContext( Graphics* gr);
+    wxGDIPlusFontData( wxGraphicsRenderer* renderer, const wxFont &font, const wxColour& col );
+    ~wxGDIPlusFontData();
+
+    virtual Brush* GetGDIPlusBrush() { return m_textBrush; }
+    virtual Font* GetGDIPlusFont() { return m_font; }
+private :
+    Brush* m_textBrush;
+    Font* m_font;
+};
+
+class WXDLLIMPEXP_CORE wxGDIPlusContext : public wxGraphicsContext
+{
+public:
+    wxGDIPlusContext( wxGraphicsRenderer* renderer, HDC hdc );
+    wxGDIPlusContext( wxGraphicsRenderer* renderer, HWND hwnd );
+    wxGDIPlusContext( wxGraphicsRenderer* renderer, Graphics* gr);

     wxGDIPlusContext();
 
     virtual ~wxGDIPlusContext();
     wxGDIPlusContext();
 
     virtual ~wxGDIPlusContext();


@@ -211,91 +286,374 @@ public:
 
        virtual void * GetNativeContext();
        
 
        virtual void * GetNativeContext();
        

-    virtual void StrokePath( const wxGraphicsPath *p );
-    virtual void FillPath( const wxGraphicsPath *p , int fillStyle = wxWINDING_RULE );
-
-    virtual wxGraphicsPath* CreatePath();
-    virtual void SetPen( const wxPen &pen );
-    virtual void SetBrush( const wxBrush &brush );
-    virtual void SetLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, const wxColour&c1, const wxColour&c2) ;
-    virtual void SetRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
-        const wxColour &oColor, const wxColour &cColor);
+    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 );    
 
 
     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 );
+
+    // sets the transform of this context
+    virtual void SetTransform( const wxGraphicsMatrix& matrix );
+
+    // gets the matrix of this context
+    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 );
     virtual void PushState();    
     virtual void PopState();
 
     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 );
     virtual void PushState();    
     virtual void PopState();
 

-    virtual void SetFont( const wxFont &font );
-    virtual void SetTextColor( const wxColour &col );    

     virtual void DrawText( const wxString &str, wxDouble x, wxDouble y);
     virtual void GetTextExtent( const wxString &str, wxDouble *width, wxDouble *height,
         wxDouble *descent, wxDouble *externalLeading ) const;
     virtual void GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const;
 
     virtual void DrawText( const wxString &str, wxDouble x, wxDouble y);
     virtual void GetTextExtent( const wxString &str, wxDouble *width, wxDouble *height,
         wxDouble *descent, wxDouble *externalLeading ) const;
     virtual void GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const;
 

-private:
-    void    Init();
-    void    SetDefaults();
+private:
+    void    Init();
+    void    SetDefaults();
+
+    Graphics* m_context;
+    vector<GraphicsState> m_stateStack;
+    GraphicsState m_state1;
+    GraphicsState m_state2;
+
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGDIPlusContext)
+};
+
+//-----------------------------------------------------------------------------
+// wxGDIPlusPen implementation
+//-----------------------------------------------------------------------------
+
+wxGDIPlusPenData::~wxGDIPlusPenData()
+{
+    delete m_pen;
+    delete m_penImage;
+    delete m_penBrush;
+}
+
+void wxGDIPlusPenData::Init()
+{
+    m_pen = NULL ;
+    m_penImage = NULL;
+    m_penBrush = NULL;
+}
+
+wxGDIPlusPenData::wxGDIPlusPenData( wxGraphicsRenderer* renderer, const wxPen &pen )
+: wxGraphicsObjectRefData(renderer)
+{    
+    Init();
+    m_width = pen.GetWidth();
+    if (m_width <= 0.0)
+        m_width = 0.1;
+
+    m_pen = new Pen(Color( pen.GetColour().Alpha() , pen.GetColour().Red() ,
+        pen.GetColour().Green() , pen.GetColour().Blue() ), m_width );
+
+    LineCap cap;
+    switch ( pen.GetCap() )
+    {
+    case wxCAP_ROUND :
+        cap = LineCapRound;
+        break;
+
+    case wxCAP_PROJECTING :
+        cap = LineCapSquare;
+        break;
+
+    case wxCAP_BUTT :
+        cap = LineCapFlat; // TODO verify
+        break;
+
+    default :
+        cap = LineCapFlat;
+        break;
+    }
+    m_pen->SetLineCap(cap,cap, DashCapFlat);
+
+    LineJoin join;
+    switch ( pen.GetJoin() )
+    {
+    case wxJOIN_BEVEL :
+        join = LineJoinBevel;
+        break;
+
+    case wxJOIN_MITER :
+        join = LineJoinMiter;
+        break;
+
+    case wxJOIN_ROUND :
+        join = LineJoinRound;
+        break;
+
+    default :
+        join = LineJoinMiter;
+        break;
+    }
+
+    m_pen->SetLineJoin(join);
+
+    m_pen->SetDashStyle(DashStyleSolid);
+
+    DashStyle dashStyle = DashStyleSolid;
+    switch ( pen.GetStyle() )
+    {
+    case wxSOLID :
+        break;
+
+    case wxDOT :
+        dashStyle = DashStyleDot;
+        break;
+
+    case wxLONG_DASH :
+        dashStyle = DashStyleDash; // TODO verify
+        break;
+
+    case wxSHORT_DASH :
+        dashStyle = DashStyleDash;
+        break;
+
+    case wxDOT_DASH :
+        dashStyle = DashStyleDashDot;
+        break;
+    case wxUSER_DASH :
+        {
+            dashStyle = DashStyleCustom;
+            wxDash *dashes;
+            int count = pen.GetDashes( &dashes );
+            if ((dashes != NULL) && (count > 0))
+            {
+                REAL *userLengths = new REAL[count];
+                for ( int i = 0; i < count; ++i )
+                {
+                    userLengths[i] = dashes[i];
+                }
+                m_pen->SetDashPattern( userLengths, count);
+                delete[] userLengths;
+            }
+        }
+        break;
+    case wxSTIPPLE :
+        {
+            wxBitmap* bmp = pen.GetStipple();
+            if ( bmp && bmp->Ok() )
+            {
+                m_penImage = Bitmap::FromHBITMAP((HBITMAP)bmp->GetHBITMAP(),(HPALETTE)bmp->GetPalette()->GetHPALETTE());
+                m_penBrush = new TextureBrush(m_penImage);
+                m_pen->SetBrush( m_penBrush );
+            }
+
+        }
+        break;
+    default :
+        if ( pen.GetStyle() >= wxFIRST_HATCH && pen.GetStyle() <= wxLAST_HATCH )
+        {
+            HatchStyle style = HatchStyleHorizontal;
+            switch( pen.GetStyle() )
+            {
+            case wxBDIAGONAL_HATCH :
+                style = HatchStyleBackwardDiagonal;
+                break ;
+            case wxCROSSDIAG_HATCH :
+                style = HatchStyleDiagonalCross;
+                break ;
+            case wxFDIAGONAL_HATCH :
+                style = HatchStyleForwardDiagonal;
+                break ;
+            case wxCROSS_HATCH :
+                style = HatchStyleCross;
+                break ;
+            case wxHORIZONTAL_HATCH :
+                style = HatchStyleHorizontal;
+                break ;
+            case wxVERTICAL_HATCH :
+                style = HatchStyleVertical;
+                break ;
+
+            }
+            m_penBrush = new HatchBrush(style,Color( pen.GetColour().Alpha() , pen.GetColour().Red() ,
+                pen.GetColour().Green() , pen.GetColour().Blue() ), Color::Transparent );
+            m_pen->SetBrush( m_penBrush );
+        }
+        break;
+    } 
+    if ( dashStyle != DashStyleSolid )
+        m_pen->SetDashStyle(dashStyle);
+}
+
+//-----------------------------------------------------------------------------
+// wxGDIPlusBrush implementation
+//-----------------------------------------------------------------------------
+
+wxGDIPlusBrushData::wxGDIPlusBrushData( wxGraphicsRenderer* renderer )
+: wxGraphicsObjectRefData(renderer)
+{
+    Init();
+}
+
+wxGDIPlusBrushData::wxGDIPlusBrushData( wxGraphicsRenderer* renderer , const wxBrush &brush )
+: wxGraphicsObjectRefData(renderer)
+{
+    Init();
+    if ( brush.GetStyle() == wxSOLID)
+    {
+        m_brush = new SolidBrush( Color( brush.GetColour().Alpha() , brush.GetColour().Red() ,
+            brush.GetColour().Green() , brush.GetColour().Blue() ) );
+    }
+    else if ( brush.IsHatch() )
+    {
+        HatchStyle style = HatchStyleHorizontal;
+        switch( brush.GetStyle() )
+        {
+        case wxBDIAGONAL_HATCH :
+            style = HatchStyleBackwardDiagonal;
+            break ;
+        case wxCROSSDIAG_HATCH :
+            style = HatchStyleDiagonalCross;
+            break ;
+        case wxFDIAGONAL_HATCH :
+            style = HatchStyleForwardDiagonal;
+            break ;
+        case wxCROSS_HATCH :
+            style = HatchStyleCross;
+            break ;
+        case wxHORIZONTAL_HATCH :
+            style = HatchStyleHorizontal;
+            break ;
+        case wxVERTICAL_HATCH :
+            style = HatchStyleVertical;
+            break ;
+
+        }
+        m_brush = new HatchBrush(style,Color( brush.GetColour().Alpha() , brush.GetColour().Red() ,
+            brush.GetColour().Green() , brush.GetColour().Blue() ), Color::Transparent );
+    }
+    else 
+    {
+        wxBitmap* bmp = brush.GetStipple();
+        if ( bmp && bmp->Ok() )
+        {
+            wxDELETE( m_brushImage );
+            m_brushImage = Bitmap::FromHBITMAP((HBITMAP)bmp->GetHBITMAP(),(HPALETTE)bmp->GetPalette()->GetHPALETTE());
+            m_brush = new TextureBrush(m_brushImage);
+        }
+    }
+}
+
+wxGDIPlusBrushData::~wxGDIPlusBrushData()
+{
+    delete m_brush;
+    delete m_brushImage;
+    delete m_brushPath;
+};
+
+void wxGDIPlusBrushData::Init()
+{
+    m_brush = NULL;
+    m_brushImage= NULL;
+    m_brushPath= NULL;
+}
+
+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 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.
+    m_brushPath = new GraphicsPath();
+    m_brushPath->AddEllipse( (REAL)(xc-radius), (REAL)(yc-radius), (REAL)(2*radius), (REAL)(2*radius));
+
+    PathGradientBrush *b = new PathGradientBrush(m_brushPath);
+    m_brush = b;
+    b->SetCenterPoint( PointF(xo,yo));
+    b->SetCenterColor(Color( oColor.Alpha(), oColor.Red(),oColor.Green() , oColor.Blue() ));
+
+    Color colors[] = {Color( cColor.Alpha(), cColor.Red(),cColor.Green() , cColor.Blue() )};
+    int count = 1;
+    b->SetSurroundColors(colors, &count);
+}
+
+//-----------------------------------------------------------------------------
+// wxGDIPlusFont implementation
+//-----------------------------------------------------------------------------

 
 

-    Graphics* m_context;
-    vector<GraphicsState> m_stateStack;
-    GraphicsState m_state1;
-    GraphicsState m_state2;
+wxGDIPlusFontData::wxGDIPlusFontData( wxGraphicsRenderer* renderer, const wxFont &font, 
+                             const wxColour& col ) : wxGraphicsObjectRefData( renderer )
+{
+    m_textBrush = NULL;
+    m_font = NULL;

 
 

-    Pen* m_pen;
-    bool m_penTransparent;
-    Image* m_penImage;
-    Brush* m_penBrush;
- 
-    Brush* m_brush;
-    bool m_brushTransparent;
-    Image* m_brushImage;
-    GraphicsPath* m_brushPath;
+    wxWCharBuffer s = font.GetFaceName().wc_str( *wxConvUI );
+    int size = font.GetPointSize();
+    int style = FontStyleRegular;
+    if ( font.GetStyle() == wxFONTSTYLE_ITALIC )
+        style |= FontStyleItalic;
+    if ( font.GetUnderlined() )
+        style |= FontStyleUnderline;
+    if ( font.GetWeight() == wxFONTWEIGHT_BOLD )
+        style |= FontStyleBold;
+    m_font = new Font( s , size , style );
+    m_textBrush = new SolidBrush( Color( col.Alpha() , col.Red() ,
+        col.Green() , col.Blue() ));
+}

 
 

-    Brush* m_textBrush;
-    Font* m_font;
-    // wxPen m_pen;
-    // wxBrush m_brush;
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGDIPlusContext)
-};
+wxGDIPlusFontData::~wxGDIPlusFontData()
+{
+    delete m_textBrush;
+    delete m_font;
+}

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxGDIPlusPath,wxGraphicsPath)
+//-----------------------------------------------------------------------------
+// wxGDIPlusPath implementation
+//-----------------------------------------------------------------------------

 
 

-wxGDIPlusPath::wxGDIPlusPath()
+wxGDIPlusPathData::wxGDIPlusPathData(wxGraphicsRenderer* renderer, GraphicsPath* path ) : wxGraphicsPathData(renderer)

 {
 {

-    m_path = new GraphicsPath();
+    if ( path )
+        m_path = path;
+    else
+        m_path = new GraphicsPath();

 }
 
 }
 

-wxGDIPlusPath::~wxGDIPlusPath()
+wxGDIPlusPathData::~wxGDIPlusPathData()

 {
     delete m_path;
 }
 
 {
     delete m_path;
 }
 

+wxGraphicsObjectRefData* wxGDIPlusPathData::Clone() const
+{
+    return new wxGDIPlusPathData( GetRenderer() , m_path->Clone());
+}
+

 //
 // The Primitives
 //
 
 //
 // 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);
 }
 
 {
     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);
 }
 
 {
     m_path->AddLine((REAL) x,(REAL) y,(REAL) x,(REAL) y);
 }
 

-void wxGDIPlusPath::CloseSubpath()
+void wxGDIPlusPathData::CloseSubpath()

 {
     m_path->CloseFigure();
 }
 
 {
     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);
 {
     PointF c1(cx1,cy1);
     PointF c2(cx2,cy2);


@@ -306,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
 }
 
 // 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);
 {
     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)
 {
     double sweepAngle = endAngle - startAngle ;
     if( abs(sweepAngle) >= 2*M_PI)


@@ -338,414 +696,263 @@ 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)); 
 }
 
    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));
 }
 
 {
     m_path->AddRectangle(RectF(x,y,w,h));
 }
 

-//-----------------------------------------------------------------------------
-// wxGDIPlusContext implementation
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxGDIPlusContext,wxGraphicsContext)
-
-wxGDIPlusContext::wxGDIPlusContext( HDC hdc  )
+void wxGDIPlusPathData::AddPath( const wxGraphicsPathData* path )

 {
 {

-    Init();
-    m_context = new Graphics( hdc);
-    SetDefaults();
+    m_path->AddPath( (GraphicsPath*) path->GetNativePath(), FALSE);

 }
 
 }
 

-wxGDIPlusContext::wxGDIPlusContext( HWND hwnd  )
-{
-    Init();
-    m_context = new Graphics( hwnd);
-    SetDefaults();
-}

 
 

-wxGDIPlusContext::wxGDIPlusContext( Graphics* gr  )
+// transforms each point of this path by the matrix
+void wxGDIPlusPathData::Transform( const wxGraphicsMatrixData* matrix ) 

 {
 {

-    Init();
-    m_context = gr;
-    SetDefaults();
+    m_path->Transform( (Matrix*) matrix->GetNativeMatrix() );

 }
 
 }
 

-wxGDIPlusContext::wxGDIPlusContext()
+// gets the bounding box enclosing all points (possibly including control points)
+void wxGDIPlusPathData::GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const

 {
 {

-    Init();
+    RectF bounds;
+    m_path->GetBounds( &bounds, NULL, NULL) ;
+    *x = bounds.X;
+    *y = bounds.Y;
+    *w = bounds.Width;
+    *h = bounds.Height;

 }
 
 }
 

-void wxGDIPlusContext::Init()
+bool wxGDIPlusPathData::Contains( wxDouble x, wxDouble y, int fillStyle ) const

 {
 {

-    gGDILoader.EnsureIsLoaded();
-    m_context = NULL;
-    m_state1 = 0;
-    m_state2= 0;
-
-    m_pen = NULL;
-    m_penTransparent = true;
-    m_penImage = NULL;
-    m_penBrush = NULL;
-
-    m_brush = NULL;
-    m_brushTransparent = true;
-    m_brushImage = NULL;
-    m_brushPath = NULL;
-
-    m_textBrush = NULL;
-    m_font = NULL;
+    m_path->SetFillMode( fillStyle == wxODDEVEN_RULE ? FillModeAlternate : FillModeWinding);
+    return m_path->IsVisible( (FLOAT) x,(FLOAT) y) == TRUE ;

 }
 
 }
 

-void wxGDIPlusContext::SetDefaults()
-{
-    m_context->SetSmoothingMode(SmoothingModeHighQuality);
-    m_state1 = m_context->Save();
-    m_state2 = m_context->Save();
-    // set defaults
-
-    m_penTransparent = false;
-    m_pen = new Pen((ARGB)Color::Black);
-    m_penImage = NULL;
-    m_penBrush = NULL;
-
-    m_brushTransparent = false;
-    m_brush = new SolidBrush((ARGB)Color::White);
-    m_brushImage = NULL;
-    m_brushPath = NULL;
-    m_textBrush = new SolidBrush((ARGB)Color::Black);
-    m_font = new Font( L"Arial" , 9 , FontStyleRegular );
-}
+//-----------------------------------------------------------------------------
+// wxGDIPlusMatrixData implementation
+//-----------------------------------------------------------------------------

 
 

-wxGDIPlusContext::~wxGDIPlusContext()
+wxGDIPlusMatrixData::wxGDIPlusMatrixData(wxGraphicsRenderer* renderer, Matrix* matrix )
+    : wxGraphicsMatrixData(renderer)

 {
 {

-    if ( m_context )
-    {
-        m_context->Restore( m_state2 );
-        m_context->Restore( m_state1 );
-        delete m_context;
-        delete m_pen;
-        delete m_penImage;
-        delete m_penBrush;
-        delete m_brush;
-        delete m_brushImage;
-        delete m_brushPath;
-        delete m_textBrush;
-        delete m_font;
-    }
+    if ( matrix )
+        m_matrix = matrix ;
+    else
+        m_matrix = new Matrix();

 }
 
 }
 

-
-void wxGDIPlusContext::Clip( const wxRegion &region )
+wxGDIPlusMatrixData::~wxGDIPlusMatrixData() 

 {
 {

-    m_context->SetClip((HRGN)region.GetHRGN(),CombineModeIntersect);
+    delete m_matrix;

 }
 
 }
 

-void wxGDIPlusContext::Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h )
+wxGraphicsObjectRefData *wxGDIPlusMatrixData::Clone() const 

 {
 {

-    m_context->SetClip(RectF(x,y,w,h),CombineModeIntersect);
+    return new wxGDIPlusMatrixData( GetRenderer(), m_matrix->Clone());

 }
 }

-       
-void wxGDIPlusContext::ResetClip()
+
+// concatenates the matrix
+void wxGDIPlusMatrixData::Concat( const wxGraphicsMatrixData *t )

 {
 {

-    m_context->ResetClip();
+    m_matrix->Multiply( (Matrix*) t->GetNativeMatrix());

 }
 
 }
 

-void wxGDIPlusContext::StrokePath( const wxGraphicsPath *path )
+// sets the matrix to the respective values
+void wxGDIPlusMatrixData::Set(wxDouble a, wxDouble b, wxDouble c, wxDouble d, 
+                 wxDouble tx, wxDouble ty)

 {
 {

-    if ( m_penTransparent )
-        return;
-
-    m_context->DrawPath( m_pen , (GraphicsPath*) path->GetNativePath() );
+    m_matrix->SetElements(a,b,c,d,tx,ty);

 }
 
 }
 

-void wxGDIPlusContext::FillPath( const wxGraphicsPath *path , int fillStyle )
+// makes this the inverse matrix
+void wxGDIPlusMatrixData::Invert()

 {
 {

-    if ( !m_brushTransparent )
-    {
-        ((GraphicsPath*) path->GetNativePath())->SetFillMode( fillStyle == wxODDEVEN_RULE ? FillModeAlternate : FillModeWinding);
-        m_context->FillPath( m_brush , (GraphicsPath*) path->GetNativePath());
-    }
+    m_matrix->Invert();

 }
 
 }
 

-wxGraphicsPath* wxGDIPlusContext::CreatePath()
+// returns true if the elements of the transformation matrix are equal ?
+bool wxGDIPlusMatrixData::IsEqual( const wxGraphicsMatrixData* t) const 

 {
 {

-    return new wxGDIPlusPath();
+    return m_matrix->Equals((Matrix*) t->GetNativeMatrix())== TRUE ;

 }
 
 }
 

-void wxGDIPlusContext::Rotate( wxDouble angle ) 
+// return true if this is the identity matrix
+bool wxGDIPlusMatrixData::IsIdentity() const

 {
 {

-    m_context->RotateTransform( RadToDeg(angle) );
+    return m_matrix->IsIdentity() == TRUE ;

 }
 
 }
 

-void wxGDIPlusContext::Translate( wxDouble dx , wxDouble dy ) 
+//
+// transformation
+//
+
+// add the translation to this matrix
+void wxGDIPlusMatrixData::Translate( wxDouble dx , wxDouble dy )

 {
 {

-    m_context->TranslateTransform( dx , dy );
+    m_matrix->Translate(dx,dy);

 }
 
 }
 

-void wxGDIPlusContext::Scale( wxDouble xScale , wxDouble yScale )
+// add the scale to this matrix
+void wxGDIPlusMatrixData::Scale( wxDouble xScale , wxDouble yScale )

 {
 {

-    m_context->ScaleTransform(xScale,yScale);
+    m_matrix->Scale(xScale,yScale);

 }
 
 }
 

-void wxGDIPlusContext::PushState()
+// add the rotation to this matrix (radians)
+void wxGDIPlusMatrixData::Rotate( wxDouble angle )

 {
 {

-    GraphicsState state = m_context->Save();
-    m_stateStack.push_back(state);
+    m_matrix->Rotate( angle );

 }
 
 }
 

-void wxGDIPlusContext::PopState() 
+//
+// apply the transforms
+//
+
+// applies that matrix to the point
+void wxGDIPlusMatrixData::TransformPoint( wxDouble *x, wxDouble *y ) const

 {
 {

-    GraphicsState state = m_stateStack.back();
-    m_stateStack.pop_back();
-    m_context->Restore(state);
+    PointF pt(*x,*y);
+    m_matrix->TransformPoints(&pt);
+    *x = pt.X;
+    *y = pt.Y;

 }
 
 }
 

-void wxGDIPlusContext::SetTextColor( const wxColour &col ) 
+// applies the matrix except for translations
+void wxGDIPlusMatrixData::TransformDistance( wxDouble *dx, wxDouble *dy ) const

 {
 {

-    delete m_textBrush;
-    m_textBrush = new SolidBrush( Color( col.Alpha() , col.Red() ,
-        col.Green() , col.Blue() ));
+    PointF pt(*dx,*dy);
+    m_matrix->TransformVectors(&pt);
+    *dx = pt.X;
+    *dy = pt.Y;

 }
 
 }
 

-void wxGDIPlusContext::SetPen( const wxPen &pen )
+// returns the native representation
+void * wxGDIPlusMatrixData::GetNativeMatrix() const

 {
 {

-    m_penTransparent = pen.GetStyle() == wxTRANSPARENT;
-    if ( m_penTransparent )
-        return;
-    
-    m_pen->SetColor( Color( pen.GetColour().Alpha() , pen.GetColour().Red() ,
-        pen.GetColour().Green() , pen.GetColour().Blue() ) );
-
-    // TODO: * m_dc->m_scaleX
-    double penWidth = pen.GetWidth();
-    if (penWidth <= 0.0)
-        penWidth = 0.1;
-
-    m_pen->SetWidth(penWidth);
-    
-    LineCap cap;
-    switch ( pen.GetCap() )
-    {
-    case wxCAP_ROUND :
-        cap = LineCapRound;
-        break;
-
-    case wxCAP_PROJECTING :
-        cap = LineCapSquare;
-        break;
-
-    case wxCAP_BUTT :
-        cap = LineCapFlat; // TODO verify
-        break;
-
-    default :
-        cap = LineCapFlat;
-        break;
-    }
-    m_pen->SetLineCap(cap,cap, DashCapFlat);
-
-    LineJoin join;
-    switch ( pen.GetJoin() )
-    {
-    case wxJOIN_BEVEL :
-        join = LineJoinBevel;
-        break;
-
-    case wxJOIN_MITER :
-        join = LineJoinMiter;
-        break;
-
-    case wxJOIN_ROUND :
-        join = LineJoinRound;
-        break;
-
-    default :
-        join = LineJoinMiter;
-        break;
-    }
-    
-    m_pen->SetLineJoin(join);
-
-    m_pen->SetDashStyle(DashStyleSolid);
-
-    DashStyle dashStyle = DashStyleSolid;
-    switch ( pen.GetStyle() )
-    {
-    case wxSOLID :
-        break;
-
-    case wxDOT :
-        dashStyle = DashStyleDot;
-        break;
-
-    case wxLONG_DASH :
-        dashStyle = DashStyleDash; // TODO verify
-        break;
-
-    case wxSHORT_DASH :
-        dashStyle = DashStyleDash;
-        break;
-
-    case wxDOT_DASH :
-        dashStyle = DashStyleDashDot;
-        break;
-    case wxUSER_DASH :
-        {
-            dashStyle = DashStyleCustom;
-            wxDash *dashes;
-            int count = pen.GetDashes( &dashes );
-            if ((dashes != NULL) && (count > 0))
-            {
-                REAL *userLengths = new REAL[count];
-                for ( int i = 0; i < count; ++i )
-                {
-                    userLengths[i] = dashes[i];
-                }
-                m_pen->SetDashPattern( userLengths, count);
-                delete[] userLengths;
-            }
-        }
-        break;
-    case wxSTIPPLE :
-        {
-            wxBitmap* bmp = pen.GetStipple();
-            if ( bmp && bmp->Ok() )
-            {
-                wxDELETE( m_penImage );
-                wxDELETE( m_penBrush );
-                m_penImage = Bitmap::FromHBITMAP((HBITMAP)bmp->GetHBITMAP(),(HPALETTE)bmp->GetPalette()->GetHPALETTE());
-                m_penBrush = new TextureBrush(m_penImage);
-                m_pen->SetBrush( m_penBrush );
-            }
-
-        }
-        break;
-    default :
-        if ( pen.GetStyle() >= wxFIRST_HATCH && pen.GetStyle() <= wxLAST_HATCH )
-        {
-            wxDELETE( m_penBrush );
-            HatchStyle style = HatchStyleHorizontal;
-            switch( pen.GetStyle() )
-            {
-            case wxBDIAGONAL_HATCH :
-                style = HatchStyleBackwardDiagonal;
-                break ;
-            case wxCROSSDIAG_HATCH :
-                style = HatchStyleDiagonalCross;
-                break ;
-            case wxFDIAGONAL_HATCH :
-                style = HatchStyleForwardDiagonal;
-                break ;
-            case wxCROSS_HATCH :
-                style = HatchStyleCross;
-                break ;
-            case wxHORIZONTAL_HATCH :
-                style = HatchStyleHorizontal;
-                break ;
-            case wxVERTICAL_HATCH :
-                style = HatchStyleVertical;
-                break ;
+    return m_matrix;
+}

 
 

-            }
-            m_penBrush = new HatchBrush(style,Color( pen.GetColour().Alpha() , pen.GetColour().Red() ,
-                pen.GetColour().Green() , pen.GetColour().Blue() ), Color::Transparent );
-            m_pen->SetBrush( m_penBrush );
-        }
-        break;
-    } 
-    if ( dashStyle != DashStyleSolid )
-        m_pen->SetDashStyle(dashStyle);
+//-----------------------------------------------------------------------------
+// wxGDIPlusContext implementation
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxGDIPlusContext,wxGraphicsContext)
+
+wxGDIPlusContext::wxGDIPlusContext( wxGraphicsRenderer* renderer, HDC hdc  ) 
+    : wxGraphicsContext(renderer)
+{
+    Init();
+    m_context = new Graphics( hdc);
+    SetDefaults();

 }
 
 }
 

-void wxGDIPlusContext::SetBrush( const wxBrush &brush )
+wxGDIPlusContext::wxGDIPlusContext( wxGraphicsRenderer* renderer, HWND hwnd  )
+    : wxGraphicsContext(renderer)

 {
 {

-//    m_brush = brush;
-    if ( m_context == NULL )
-        return;
+    Init();
+    m_context = new Graphics( hwnd);
+    SetDefaults();
+}

 
 

-    m_brushTransparent = brush.GetStyle() == wxTRANSPARENT;
+wxGDIPlusContext::wxGDIPlusContext( wxGraphicsRenderer* renderer, Graphics* gr  )
+    : wxGraphicsContext(renderer)
+{
+    Init();
+    m_context = gr;
+    SetDefaults();
+}

 
 

-    if ( m_brushTransparent )
-        return;
+wxGDIPlusContext::wxGDIPlusContext() : wxGraphicsContext(NULL)
+{
+    Init();
+}

 
 

-    wxDELETE(m_brush);
+void wxGDIPlusContext::Init()
+{
+    m_context = NULL;
+    m_state1 = 0;
+    m_state2= 0;
+}

 
 

-    if ( brush.GetStyle() == wxSOLID)
-    {
-        m_brush = new SolidBrush( Color( brush.GetColour().Alpha() , brush.GetColour().Red() ,
-            brush.GetColour().Green() , brush.GetColour().Blue() ) );
-    }
-    else if ( brush.IsHatch() )
-    {
-        HatchStyle style = HatchStyleHorizontal;
-        switch( brush.GetStyle() )
-        {
-        case wxBDIAGONAL_HATCH :
-            style = HatchStyleBackwardDiagonal;
-            break ;
-        case wxCROSSDIAG_HATCH :
-            style = HatchStyleDiagonalCross;
-            break ;
-        case wxFDIAGONAL_HATCH :
-            style = HatchStyleForwardDiagonal;
-            break ;
-        case wxCROSS_HATCH :
-            style = HatchStyleCross;
-            break ;
-        case wxHORIZONTAL_HATCH :
-            style = HatchStyleHorizontal;
-            break ;
-        case wxVERTICAL_HATCH :
-            style = HatchStyleVertical;
-            break ;
+void wxGDIPlusContext::SetDefaults()
+{
+    m_context->SetSmoothingMode(SmoothingModeHighQuality);
+    m_state1 = m_context->Save();
+    m_state2 = m_context->Save();
+}

 
 

-        }
-        m_brush = new HatchBrush(style,Color( brush.GetColour().Alpha() , brush.GetColour().Red() ,
-            brush.GetColour().Green() , brush.GetColour().Blue() ), Color::Transparent );
-    }
-    else 
+wxGDIPlusContext::~wxGDIPlusContext()
+{
+    if ( m_context )

     {
     {

-        wxBitmap* bmp = brush.GetStipple();
-        if ( bmp && bmp->Ok() )
-        {
-            wxDELETE( m_brushImage );
-            m_brushImage = Bitmap::FromHBITMAP((HBITMAP)bmp->GetHBITMAP(),(HPALETTE)bmp->GetPalette()->GetHPALETTE());
-            m_brush = new TextureBrush(m_brushImage);
-        }
+        m_context->Restore( m_state2 );
+        m_context->Restore( m_state1 );
+        delete m_context;

     }
 }
 
     }
 }
 

-void wxGDIPlusContext::SetLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, const wxColour&c1, const wxColour&c2) 
+
+void wxGDIPlusContext::Clip( const wxRegion &region )

 {
 {

-    m_brushTransparent = false ;
+    m_context->SetClip((HRGN)region.GetHRGN(),CombineModeIntersect);
+}

 
 

-    wxDELETE(m_brush);
+void wxGDIPlusContext::Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h )
+{
+    m_context->SetClip(RectF(x,y,w,h),CombineModeIntersect);
+}
+       
+void wxGDIPlusContext::ResetClip()
+{
+    m_context->ResetClip();
+}

 
 

-    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 wxGDIPlusContext::StrokePath( const wxGraphicsPath& path )
+{
+    if ( !m_pen.IsNull() )
+    {
+        m_context->DrawPath( ((wxGDIPlusPenData*)m_pen.GetGraphicsData())->GetGDIPlusPen() , (GraphicsPath*) path.GetNativePath() );
+    }

 }
 
 }
 

-void wxGDIPlusContext::SetRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
-                                    const wxColour &oColor, const wxColour &cColor)
+void wxGDIPlusContext::FillPath( const wxGraphicsPath& path , int fillStyle )

 {
 {

-    m_brushTransparent = false ;
+    if ( !m_brush.IsNull() )
+    {
+        ((GraphicsPath*) path.GetNativePath())->SetFillMode( fillStyle == wxODDEVEN_RULE ? FillModeAlternate : FillModeWinding);
+        m_context->FillPath( ((wxGDIPlusBrushData*)m_brush.GetRefData())->GetGDIPlusBrush() , 
+            (GraphicsPath*) path.GetNativePath());
+    }
+}

 
 

-    wxDELETE(m_brush);
-    wxDELETE(m_brushPath);
+void wxGDIPlusContext::Rotate( wxDouble angle ) 
+{
+    m_context->RotateTransform( RadToDeg(angle) );
+}

 
 

-    // Create a path that consists of a single circle.
-    m_brushPath = new GraphicsPath();
-    m_brushPath->AddEllipse( (REAL)(xc-radius), (REAL)(yc-radius), (REAL)(2*radius), (REAL)(2*radius));
+void wxGDIPlusContext::Translate( wxDouble dx , wxDouble dy ) 
+{
+    m_context->TranslateTransform( dx , dy );
+}

 
 

-    PathGradientBrush *b = new PathGradientBrush(m_brushPath);
-    m_brush = b;
-    b->SetCenterPoint( PointF(xo,yo));
-    b->SetCenterColor(Color( oColor.Alpha(), oColor.Red(),oColor.Green() , oColor.Blue() ));
+void wxGDIPlusContext::Scale( wxDouble xScale , wxDouble yScale )
+{
+    m_context->ScaleTransform(xScale,yScale);
+}

 
 

-    Color colors[] = {Color( cColor.Alpha(), cColor.Red(),cColor.Green() , cColor.Blue() )};
-    int count = 1;
-    b->SetSurroundColors(colors, &count);
+void wxGDIPlusContext::PushState()
+{
+    GraphicsState state = m_context->Save();
+    m_stateStack.push_back(state);
+}
+
+void wxGDIPlusContext::PopState() 
+{
+    GraphicsState state = m_stateStack.back();
+    m_stateStack.pop_back();
+    m_context->Restore(state);

 }
 
 // the built-in conversions functions create non-premultiplied bitmaps, while GDIPlus needs them in the 
 }
 
 // the built-in conversions functions create non-premultiplied bitmaps, while GDIPlus needs them in the 


@@ -878,14 +1085,14 @@ void wxGDIPlusContext::DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxD
     DeleteObject(iconInfo.hbmMask);
 }
 
     DeleteObject(iconInfo.hbmMask);
 }
 

-

 void wxGDIPlusContext::DrawText( const wxString &str, wxDouble x, wxDouble y ) 
 {
 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 );
         return ;
 
     wxWCharBuffer s = str.wc_str( *wxConvUI );

-    m_context->DrawString( s , -1 , m_font , PointF( x , y ) , m_textBrush );
+    m_context->DrawString( s , -1 , ((wxGDIPlusFontData*)m_font.GetRefData())->GetGDIPlusFont() , 
+            PointF( x , y ) , ((wxGDIPlusFontData*)m_font.GetRefData())->GetGDIPlusBrush() );

     // TODO m_backgroundMode == wxSOLID
 }
 
     // TODO m_backgroundMode == wxSOLID
 }
 


@@ -894,17 +1101,18 @@ void wxGDIPlusContext::GetTextExtent( const wxString &str, wxDouble *width, wxDo
 {
     wxWCharBuffer s = str.wc_str( *wxConvUI );
     FontFamily ffamily ;
 {
     wxWCharBuffer s = str.wc_str( *wxConvUI );
     FontFamily ffamily ;

+    Font* f = ((wxGDIPlusFontData*)m_font.GetRefData())->GetGDIPlusFont();

     
     

-    m_font->GetFamily(&ffamily) ;
+    f->GetFamily(&ffamily) ;

 
     REAL factorY = m_context->GetDpiY() / 72.0 ;
 
     REAL rDescent = ffamily.GetCellDescent(FontStyleRegular) *
 
     REAL factorY = m_context->GetDpiY() / 72.0 ;
 
     REAL rDescent = ffamily.GetCellDescent(FontStyleRegular) *

-        m_font->GetSize() / ffamily.GetEmHeight(FontStyleRegular);
+        f->GetSize() / ffamily.GetEmHeight(FontStyleRegular);

     REAL rAscent = ffamily.GetCellAscent(FontStyleRegular) *
     REAL rAscent = ffamily.GetCellAscent(FontStyleRegular) *

-        m_font->GetSize() / ffamily.GetEmHeight(FontStyleRegular);
+        f->GetSize() / ffamily.GetEmHeight(FontStyleRegular);

     REAL rHeight = ffamily.GetLineSpacing(FontStyleRegular) *
     REAL rHeight = ffamily.GetLineSpacing(FontStyleRegular) *

-        m_font->GetSize() / ffamily.GetEmHeight(FontStyleRegular);
+        f->GetSize() / ffamily.GetEmHeight(FontStyleRegular);

 
     if ( height )
         *height = rHeight * factorY + 0.5 ;
 
     if ( height )
         *height = rHeight * factorY + 0.5 ;


@@ -927,7 +1135,7 @@ void wxGDIPlusContext::GetTextExtent( const wxString &str, wxDouble *width, wxDo
         CharacterRange strRange(0,wcslen(s));
         strFormat.SetMeasurableCharacterRanges(1,&strRange);
         Region region ;
         CharacterRange strRange(0,wcslen(s));
         strFormat.SetMeasurableCharacterRanges(1,&strRange);
         Region region ;

-        m_context->MeasureCharacterRanges(s, -1 , m_font,layoutRect, &strFormat,1,&region) ;
+        m_context->MeasureCharacterRanges(s, -1 , f,layoutRect, &strFormat,1,&region) ;

         RectF bbox ;
         region.GetBounds(&bbox,m_context);
         if ( width )
         RectF bbox ;
         region.GetBounds(&bbox,m_context);
         if ( width )


@@ -943,6 +1151,7 @@ void wxGDIPlusContext::GetPartialTextExtents(const wxString& text, wxArrayDouble
     if (text.empty())
         return;
 
     if (text.empty())
         return;
 

+    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"));
     wxWCharBuffer ws = text.wc_str( *wxConvUI );
     size_t len = wcslen( ws ) ;
     wxASSERT_MSG(text.length() == len , wxT("GetPartialTextExtents not yet implemented for multichar situations"));


@@ -958,7 +1167,7 @@ void wxGDIPlusContext::GetPartialTextExtents(const wxString& text, wxArrayDouble
         ranges[i].Length = 1 ;
     }
     strFormat.SetMeasurableCharacterRanges(len,ranges);
         ranges[i].Length = 1 ;
     }
     strFormat.SetMeasurableCharacterRanges(len,ranges);

-    m_context->MeasureCharacterRanges(ws, -1 , m_font,layoutRect, &strFormat,1,regions) ;
+    m_context->MeasureCharacterRanges(ws, -1 , f,layoutRect, &strFormat,1,regions) ;

 
     RectF bbox ;
     for ( size_t i = 0 ; i < len ; ++i)
 
     RectF bbox ;
     for ( size_t i = 0 ; i < len ; ++i)


@@ -968,42 +1177,246 @@ void wxGDIPlusContext::GetPartialTextExtents(const wxString& text, wxArrayDouble
     }
 }
 
     }
 }
 

-void wxGDIPlusContext::SetFont( const wxFont &font ) 
+void* wxGDIPlusContext::GetNativeContext() 

 {
 {

-    wxASSERT( font.Ok());
-    delete m_font;
-    wxWCharBuffer s = font.GetFaceName().wc_str( *wxConvUI );
-    int size = font.GetPointSize();
-    int style = FontStyleRegular;
-    if ( font.GetStyle() == wxFONTSTYLE_ITALIC )
-        style |= FontStyleItalic;
-    if ( font.GetUnderlined() )
-        style |= FontStyleUnderline;
-    if ( font.GetWeight() == wxFONTWEIGHT_BOLD )
-        style |= FontStyleBold;
-    m_font = new Font( s , size , style );
+       return m_context;

 }
 
 }
 

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

 {
 {

-       return m_context;
+    m_context->MultiplyTransform((Matrix*) matrix.GetNativeMatrix());
+}
+
+// sets the transform of this context
+void wxGDIPlusContext::SetTransform( const wxGraphicsMatrix& matrix )
+{
+    m_context->SetTransform((Matrix*) matrix.GetNativeMatrix());
+}
+
+// gets the matrix of this context
+wxGraphicsMatrix wxGDIPlusContext::GetTransform() const
+{
+    wxGraphicsMatrix matrix = CreateMatrix();
+    m_context->GetTransform((Matrix*) matrix.GetNativeMatrix());
+    return matrix;
+}
+//-----------------------------------------------------------------------------
+// wxGDIPlusRenderer declaration
+//-----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_CORE wxGDIPlusRenderer : public wxGraphicsRenderer
+{
+public :
+    wxGDIPlusRenderer() 
+    {
+        m_loaded = false;
+        m_gditoken = NULL;
+    }
+
+    virtual ~wxGDIPlusRenderer() 
+    {
+        if (m_loaded)
+        {
+            Unload();
+        }
+    }
+
+    // Context
+
+    virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc);
+
+    virtual wxGraphicsContext * CreateContextFromNativeContext( void * context );
+
+    virtual wxGraphicsContext * CreateContextFromNativeWindow( void * window );
+
+    virtual wxGraphicsContext * CreateContext( wxWindow* window );
+
+    // 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 ) ;
+
+    // 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, 
+        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,
+        const wxColour &oColor, const wxColour &cColor) ;
+
+    // sets the font
+    virtual wxGraphicsFont CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) ;
+protected :
+    void EnsureIsLoaded();
+    void Load();
+    void Unload();
+
+private :
+    bool m_loaded;
+    DWORD m_gditoken;
+
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGDIPlusRenderer)
+} ;
+
+//-----------------------------------------------------------------------------
+// wxGDIPlusRenderer implementation
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxGDIPlusRenderer,wxGraphicsRenderer)
+
+static wxGDIPlusRenderer gs_GDIPlusRenderer;
+
+wxGraphicsRenderer* wxGraphicsRenderer::GetDefaultRenderer()
+{
+    return &gs_GDIPlusRenderer;
+}
+
+void wxGDIPlusRenderer::EnsureIsLoaded()
+{
+    if (!m_loaded)
+    {
+        Load();
+    }
+}
+
+void wxGDIPlusRenderer::Load()
+{
+    GdiplusStartupInput input;
+    GdiplusStartupOutput output;
+    GdiplusStartup(&m_gditoken,&input,&output);
+    m_loaded = true;
+}
+
+void wxGDIPlusRenderer::Unload()
+{
+    if ( m_gditoken )
+        GdiplusShutdown(m_gditoken);
+}
+
+wxGraphicsContext * wxGDIPlusRenderer::CreateContext( const wxWindowDC& dc)
+{
+    EnsureIsLoaded();
+    return new wxGDIPlusContext(this,(HDC) dc.GetHDC());
+}
+
+wxGraphicsContext * wxGDIPlusRenderer::CreateContextFromNativeContext( void * context )
+{
+    EnsureIsLoaded();
+    return new wxGDIPlusContext(this,(Graphics*) context);
+}
+
+
+wxGraphicsContext * wxGDIPlusRenderer::CreateContextFromNativeWindow( void * window )
+{
+    EnsureIsLoaded();
+    return new wxGDIPlusContext(this,(HWND) window);
+}
+
+wxGraphicsContext * wxGDIPlusRenderer::CreateContext( wxWindow* window )
+{
+    EnsureIsLoaded();
+    return new wxGDIPlusContext(this, (HWND) window->GetHWND() );
+}
+
+// Path
+
+wxGraphicsPath wxGDIPlusRenderer::CreatePath()
+{
+    EnsureIsLoaded();
+    wxGraphicsPath m;
+    m.SetRefData( new wxGDIPlusPathData(this));
+    return m;

 }
 
 }
 

-wxGraphicsContext* wxGraphicsContext::Create( const wxWindowDC& dc)
+
+// Matrix
+
+wxGraphicsMatrix wxGDIPlusRenderer::CreateMatrix( wxDouble a, wxDouble b, wxDouble c, wxDouble d, 
+                                                           wxDouble tx, wxDouble ty)
+

 {
 {

-    return new wxGDIPlusContext( (HDC) dc.GetHDC() );
+    EnsureIsLoaded();
+    wxGraphicsMatrix m;
+    wxGDIPlusMatrixData* data = new wxGDIPlusMatrixData( this );
+    data->Set( a,b,c,d,tx,ty ) ;
+    m.SetRefData(data);
+    return m;

 }
 
 }
 

-wxGraphicsContext* wxGraphicsContext::Create( wxWindow * window )
+wxGraphicsPen wxGDIPlusRenderer::CreatePen(const wxPen& pen) 

 {
 {

-    return new wxGDIPlusContext( (HWND) window->GetHWND() );
+    EnsureIsLoaded();
+    if ( !pen.Ok() || pen.GetStyle() == wxTRANSPARENT )
+        return wxNullGraphicsPen;
+    else
+    {
+        wxGraphicsPen p;
+        p.SetRefData(new wxGDIPlusPenData( this, pen ));
+        return p;
+    }

 }
 
 }
 

-wxGraphicsContext* wxGraphicsContext::CreateFromNative( void * context )
+wxGraphicsBrush wxGDIPlusRenderer::CreateBrush(const wxBrush& brush ) 

 {
 {

-    return new wxGDIPlusContext( (Graphics*) context );
+    EnsureIsLoaded();
+    if ( !brush.Ok() || brush.GetStyle() == wxTRANSPARENT )
+        return wxNullGraphicsBrush;
+    else
+    {
+        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, 
+                                                                      const wxColour&c1, const wxColour&c2) 
+{
+    EnsureIsLoaded();
+    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,
+                                                                      const wxColour &oColor, const wxColour &cColor) 
+{
+    EnsureIsLoaded();
+    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 ) 
+{
+    EnsureIsLoaded();
+    if ( font.Ok() )
+    {        
+        wxGraphicsFont p;
+        p.SetRefData(new wxGDIPlusFontData( this , font, col ));
+        return p;
+    }
+    else
+        return wxNullGraphicsFont;
+}

 
 #endif  // wxUSE_GRAPHICS_CONTEXT
 
 #endif  // wxUSE_GRAPHICS_CONTEXT