Robert Lang's patch [ 1583183 ] Fixes printing/print preview inconsistencies

[wxWidgets.git] / src / generic / graphicc.cpp

diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp
index bd612032c88669359880e783b1f7ab4ed937ef60..e0281739250c07d180bbfd9764d1d00ebc7072a4 100755 (executable)
--- a/src/generic/graphicc.cpp
+++ b/src/generic/graphicc.cpp
@@ -32,6 +32,10 @@
 #include "wx/module.h"
 #endif
 
 #include "wx/module.h"
 #endif
 

+#ifdef __WXGTK__
+#include "wx/gtk/win_gtk.h"
+#endif
+

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


@@ -95,15 +99,18 @@ static inline double RadToDeg(double deg)
 #endif
 
 #include <cairo.h>
 #endif
 
 #include <cairo.h>

+#ifdef __WXGTK__

 #include <gtk/gtk.h>
 #include <gtk/gtk.h>

+#endif

 
 

-class WXDLLEXPORT wxCairoPath : public wxGraphicsPath
+class WXDLLIMPEXP_CORE wxCairoPath : public wxGraphicsPath

 {
 {

-    DECLARE_NO_COPY_CLASS(wxCairoPath)

 public :
     wxCairoPath();
 public :
     wxCairoPath();

+    wxCairoPath(wxGraphicsRenderer* renderer, cairo_t* pathcontext = NULL);

     ~wxCairoPath();
 
     ~wxCairoPath();
 

+    virtual wxGraphicsPath *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


@@ -125,6 +132,9 @@ public :
     // gets the last point of the current path, (0,0) if not yet set
     virtual void GetCurrentPoint( wxDouble& x, wxDouble&y) ;
 
     // gets the last point of the current path, (0,0) if not yet set
     virtual void GetCurrentPoint( wxDouble& x, wxDouble&y) ;
 

+    // adds another path
+    virtual void AddPath( const wxGraphicsPath* path );
+

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


@@ -144,96 +154,175 @@ public :
     virtual void AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r )  ;
     */
 
     virtual void AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r )  ;
     */
 

-    cairo_path_t* GetPath() const;
+    // returns the native path
+    virtual void * GetNativePath() const ;
+
+    // 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 *h) ;
+
+    virtual bool Contains( wxDouble x, wxDouble y, int fillStyle = wxWINDING_RULE) ;
+

 private :
     cairo_t* m_pathContext;
 private :
     cairo_t* m_pathContext;

+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxCairoPath)

 };
 
 };
 

-wxCairoPath::wxCairoPath()
+class WXDLLIMPEXP_CORE wxCairoMatrix : public wxGraphicsMatrix

 {
 {

-    cairo_surface_t* surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32,1,1);
-    m_pathContext = cairo_create(surface);
-    cairo_surface_destroy (surface);
-}
+public :
+    wxCairoMatrix() ;

 
 

-wxCairoPath::~wxCairoPath()
-{
-    cairo_destroy(m_pathContext);
-}
+    wxCairoMatrix(wxGraphicsRenderer* renderer, const cairo_matrix_t* matrix = NULL ) ;
+    virtual ~wxCairoMatrix() ;

 
 

-cairo_path_t* wxCairoPath::GetPath() const
-{
-    return cairo_copy_path(m_pathContext) ;
-}
+    virtual wxGraphicsMatrix *Clone() const ;

 
 

-//
-// The Primitives
-//
+    // concatenates the matrix
+    virtual void Concat( const wxGraphicsMatrix *t );

 
 

-void wxCairoPath::MoveToPoint( wxDouble x , wxDouble y )
-{
-    cairo_move_to(m_pathContext,x,y);
-}
+    // copies the passed in matrix
+    virtual void Copy( const wxGraphicsMatrix *t );

 
 

-void wxCairoPath::AddLineToPoint( wxDouble x , wxDouble y )
-{
-    cairo_line_to(m_pathContext,x,y);
-}
+    // 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);

 
 

-void wxCairoPath::CloseSubpath()
-{
-    cairo_close_path(m_pathContext);
-}
+    // makes this the inverse matrix
+    virtual void Invert();

 
 

-void wxCairoPath::AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y )
-{
-    cairo_curve_to(m_pathContext,cx1,cy1,cx2,cy2,x,y);
-}
+    // returns true if the elements of the transformation matrix are equal ?
+    virtual bool IsEqual( const wxGraphicsMatrix* t) const ;

 
 

-// gets the last point of the current path, (0,0) if not yet set
-void wxCairoPath::GetCurrentPoint( wxDouble& x, wxDouble&y)
-{
-    double dx,dy;
-    cairo_get_current_point(m_pathContext,&dx,&dy);
-    x = dx;
-    y = dy;
-}
+    // return true if this is the identity matrix
+    virtual bool IsIdentity();

 
 

-void wxCairoPath::AddArc( wxDouble x, wxDouble y, wxDouble r, double startAngle, double endAngle, bool clockwise )
+    //
+    // 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 );
+
+    // applies the matrix except for translations
+    virtual void TransformDistance( wxDouble *dx, wxDouble *dy );
+
+    // returns the native representation
+    virtual void * GetNativeMatrix() const;
+private:
+    cairo_matrix_t m_matrix ;
+
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxCairoMatrix)
+} ;
+
+class WXDLLIMPEXP_CORE wxCairoPen : public wxGraphicsPen

 {
 {

-    // as clockwise means positive in our system (y pointing downwards) 
-    // TODO make this interpretation dependent of the
-    // real device trans
-    if ( clockwise||(endAngle-startAngle)>=2*M_PI)
-        cairo_arc(m_pathContext,x,y,r,startAngle,endAngle);
-    else
-        cairo_arc_negative(m_pathContext,x,y,r,startAngle,endAngle);
-}
+public:
+    wxCairoPen();
+    wxCairoPen( wxGraphicsRenderer* renderer, const wxPen &pen );
+    ~wxCairoPen();
+
+    void Init();
+
+    virtual void Apply( wxGraphicsContext* context );
+    virtual wxDouble GetWidth() { return m_width; }
+
+private :
+    double m_width;
+    
+    double m_red;
+    double m_green;
+    double m_blue;
+    double m_alpha;
+    
+    cairo_line_cap_t m_cap;
+    cairo_line_join_t m_join;
+
+    int m_count;
+    const double *m_lengths;
+    double *m_userLengths;

 
 

-/*
-void wxCairoPath::AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h )
+    wxPen m_pen;
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxCairoPen)
+};
+
+class WXDLLIMPEXP_CORE wxCairoBrush : public wxGraphicsBrush

 {
 {

-    m_path->AddRectangle(RectF(x,y,w,h));
-}
-*/
-//
-//
-//
-/*
-// closes the current subpath
-void wxCairoPath::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r ) 
+public:
+    wxCairoBrush();
+    wxCairoBrush( wxGraphicsRenderer* renderer );
+    wxCairoBrush( wxGraphicsRenderer* renderer, const wxBrush &brush );
+    ~wxCairoBrush ();
+
+    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 );
+
+protected:
+    virtual void Init();
+
+private :
+    double m_red;
+    double m_green;
+    double m_blue;
+    double m_alpha;
+
+    cairo_pattern_t* m_brushPattern;
+
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxCairoBrush)
+};
+
+class wxCairoFont : public wxGraphicsFont

 {
 {

-//    CGPathAddArcToPoint( m_path, NULL , x1, y1, x2, y2, r); 
-}
- 
-*/
+public:
+    wxCairoFont();
+    wxCairoFont( wxGraphicsRenderer* renderer, const wxFont &font, const wxColour& col );
+    ~wxCairoFont();
+
+    virtual void Apply( wxGraphicsContext* context );
+private :
+    wxCharBuffer m_fontName;
+    double m_size;
+    cairo_font_slant_t m_slant;
+    cairo_font_weight_t m_weight;
+    double m_red;
+    double m_green;
+    double m_blue;
+    double m_alpha;
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxCairoFont)
+};

 
 

-class WXDLLEXPORT wxCairoContext : public wxGraphicsContext
+class WXDLLIMPEXP_CORE wxCairoContext : public wxGraphicsContext

 {
     DECLARE_NO_COPY_CLASS(wxCairoContext)
 
 public:
 {
     DECLARE_NO_COPY_CLASS(wxCairoContext)
 
 public:

-    wxCairoContext( const wxWindowDC& dc );
+    wxCairoContext( wxGraphicsRenderer* renderer, const wxWindowDC& dc );
+#ifdef __WXGTK__
+    wxCairoContext( wxGraphicsRenderer* renderer, GdkDrawable *drawable );
+#endif
+    wxCairoContext( wxGraphicsRenderer* renderer, cairo_t *context );
+    wxCairoContext( wxGraphicsRenderer* renderer, wxWindow *window);

     wxCairoContext();
     virtual ~wxCairoContext();
 
     wxCairoContext();
     virtual ~wxCairoContext();
 


@@ -241,33 +330,33 @@ 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();
+

     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 = 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 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 void GetTransform( wxGraphicsMatrix* matrix );
+

     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 DrawText( const wxString &str, wxDouble x, wxDouble y);
     virtual void GetTextExtent( const wxString &str, wxDouble *width, wxDouble *height,
                                 wxDouble *descent, wxDouble *externalLeading ) const;


@@ -275,146 +364,100 @@ public:
 
 private:
     cairo_t* m_context;
 
 private:
     cairo_t* m_context;

-    bool m_penTransparent;
-    bool m_brushTransparent;
-
-    wxPen m_pen;
-    wxBrush m_brush;
-    cairo_pattern_t* m_brushPattern;
-    wxColour m_textColour;

 };
 
 };
 

-
-
-

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-// wxCairoContext implementation
+// wxCairoPen implementation

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-wxCairoContext::wxCairoContext( const wxWindowDC& dc  )
-{
-    m_context = gdk_cairo_create( dc.m_window ) ;
-    PushState();
-    PushState();
-    m_penTransparent = true;
-    m_brushTransparent = true;
-    m_brushPattern = NULL ;
-}
+IMPLEMENT_DYNAMIC_CLASS(wxCairoPen,wxGraphicsPen)

 
 

-wxCairoContext::~wxCairoContext()
+wxCairoPen::wxCairoPen() : wxGraphicsPen(NULL)

 {
 {

-    if ( m_context )
-    {
-        PopState();
-        PopState();
-        cairo_destroy(m_context);
-        if ( m_brushPattern )
-            cairo_pattern_destroy(m_brushPattern);
-    }
+    wxLogDebug(wxT("Illegal Constructor called"));

 }
 
 }
 

-
-void wxCairoContext::Clip( const wxRegion & WXUNUSED(region) )
+wxCairoPen::~wxCairoPen()

 {
 {

-// TODO
+    delete[] m_userLengths;

 }
 
 }
 

-void wxCairoContext::Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h )
-{
-// TODO
-}
-       
-void wxCairoContext::ResetClip()
+void wxCairoPen::Init()

 {
 {

-// TODO
+    m_lengths = NULL;
+    m_userLengths = NULL;
+    m_width = 0;
+    m_count = 0;

 }
 
 }
 

+wxCairoPen::wxCairoPen( wxGraphicsRenderer* renderer, const wxPen &pen )
+: wxGraphicsPen(renderer)
+{    
+    Init();
+    m_width = pen.GetWidth();
+    if (m_width <= 0.0)
+        m_width = 0.1;

 
 

-void wxCairoContext::StrokePath( const wxGraphicsPath *p )
-{
-    if ( m_penTransparent )
-        return;
-
-    const wxCairoPath* path = dynamic_cast< const wxCairoPath*>( p );
-    cairo_path_t* cp = path->GetPath() ;
-    cairo_append_path(m_context,cp);
-
-    // setup pen
-
-    // TODO: * m_dc->m_scaleX
-    double penWidth = m_pen.GetWidth();
-    if (penWidth <= 0.0)
-        penWidth = 0.1;
+    m_red = m_pen.GetColour().Red()/255.0;
+    m_green = m_pen.GetColour().Green()/255.0; 
+    m_blue = m_pen.GetColour().Blue()/255.0;
+    m_alpha = m_pen.GetColour().Alpha()/255.0;

 
 

-    cairo_set_line_width(m_context,penWidth);
-    cairo_set_source_rgba(m_context,m_pen.GetColour().Red()/255.0,
-                          m_pen.GetColour().Green()/255.0, m_pen.GetColour().Blue()/255.0,m_pen.GetColour().Alpha()/255.0);
-
-    cairo_line_cap_t cap;

     switch ( m_pen.GetCap() )
     {
     case wxCAP_ROUND :
     switch ( m_pen.GetCap() )
     {
     case wxCAP_ROUND :

-        cap = CAIRO_LINE_CAP_ROUND;
+        m_cap = CAIRO_LINE_CAP_ROUND;

         break;
 
     case wxCAP_PROJECTING :
         break;
 
     case wxCAP_PROJECTING :

-        cap = CAIRO_LINE_CAP_SQUARE;
+        m_cap = CAIRO_LINE_CAP_SQUARE;

         break;
 
     case wxCAP_BUTT :
         break;
 
     case wxCAP_BUTT :

-        cap = CAIRO_LINE_CAP_BUTT;
+        m_cap = CAIRO_LINE_CAP_BUTT;

         break;
 
     default :
         break;
 
     default :

-        cap = CAIRO_LINE_CAP_BUTT;
+        m_cap = CAIRO_LINE_CAP_BUTT;

         break;
     }
         break;
     }

-    cairo_set_line_cap(m_context,cap);

 
 

-    cairo_line_join_t join;

     switch ( m_pen.GetJoin() )
     {
     case wxJOIN_BEVEL :
     switch ( m_pen.GetJoin() )
     {
     case wxJOIN_BEVEL :

-        join = CAIRO_LINE_JOIN_BEVEL;
+        m_join = CAIRO_LINE_JOIN_BEVEL;

         break;
 
     case wxJOIN_MITER :
         break;
 
     case wxJOIN_MITER :

-        join = CAIRO_LINE_JOIN_MITER;
+        m_join = CAIRO_LINE_JOIN_MITER;

         break;
 
     case wxJOIN_ROUND :
         break;
 
     case wxJOIN_ROUND :

-        join = CAIRO_LINE_JOIN_ROUND;
+        m_join = CAIRO_LINE_JOIN_ROUND;

         break;
 
     default :
         break;
 
     default :

-        join = CAIRO_LINE_JOIN_MITER;
+        m_join = CAIRO_LINE_JOIN_MITER;

         break;
     }
         break;
     }

-    cairo_set_line_join(m_context,join);
-
-    int num_dashes = 0;
-    const double * dashes = NULL;
-    double offset = 0.0;

 
 

-    const double dashUnit = penWidth < 1.0 ? 1.0 : penWidth;
-
-    double *userLengths = NULL;
+    const double dashUnit = m_width < 1.0 ? 1.0 : m_width;

     const double dotted[] =
     const double dotted[] =

-        {
-            dashUnit , dashUnit + 2.0
-        };
-    const double short_dashed[] =
-        {
-            9.0 , 6.0
-        };
-    const double dashed[] =
-        {
-            19.0 , 9.0
-        };
-    const double dotted_dashed[] =
-        {
-            9.0 , 6.0 , 3.0 , 3.0
-        };
+    {
+        dashUnit , dashUnit + 2.0
+    };
+    static const double short_dashed[] =
+    {
+        9.0 , 6.0
+    };
+    static const double dashed[] =
+    {
+        19.0 , 9.0
+    };
+    static const double dotted_dashed[] =
+    {
+        9.0 , 6.0 , 3.0 , 3.0
+    };

 
     switch ( m_pen.GetStyle() )
     {
 
     switch ( m_pen.GetStyle() )
     {


@@ -422,58 +465,59 @@ void wxCairoContext::StrokePath( const wxGraphicsPath *p )
         break;
 
     case wxDOT :
         break;
 
     case wxDOT :

-        dashes = dotted ;
-        num_dashes = WXSIZEOF(dotted)
-                     ;
+        m_count = WXSIZEOF(dotted);
+        m_userLengths = new double[ m_count ] ;
+        memcpy( m_userLengths, dotted, sizeof(dotted) );
+        m_lengths = m_userLengths;

         break;
 
     case wxLONG_DASH :
         break;
 
     case wxLONG_DASH :

-        dashes = dotted ;
-        num_dashes = WXSIZEOF(dashed);
+        m_lengths = dotted ;
+        m_count = WXSIZEOF(dashed);

         break;
 
     case wxSHORT_DASH :
         break;
 
     case wxSHORT_DASH :

-        dashes = dotted ;
-        num_dashes = WXSIZEOF(short_dashed);
+        m_lengths = dotted ;
+        m_count = WXSIZEOF(short_dashed);

         break;
 
     case wxDOT_DASH :
         break;
 
     case wxDOT_DASH :

-        dashes = dotted ;
-        num_dashes = WXSIZEOF(dotted_dashed);
+        m_lengths = dotted ;
+        m_count = WXSIZEOF(dotted_dashed);

         break;
 
     case wxUSER_DASH :
         {
             wxDash *wxdashes ;
         break;
 
     case wxUSER_DASH :
         {
             wxDash *wxdashes ;

-            num_dashes = m_pen.GetDashes( &wxdashes ) ;
-            if ((wxdashes != NULL) && (num_dashes > 0))
+            m_count = m_pen.GetDashes( &wxdashes ) ;
+            if ((wxdashes != NULL) && (m_count > 0))

             {
             {

-                userLengths = new double[num_dashes] ;
-                for ( int i = 0 ; i < num_dashes ; ++i )
+                m_userLengths = new double[m_count] ;
+                for ( int i = 0 ; i < m_count ; ++i )

                 {
                 {

-                    userLengths[i] = wxdashes[i] * dashUnit ;
+                    m_userLengths[i] = wxdashes[i] * dashUnit ;

 
 

-                    if ( i % 2 == 1 && userLengths[i] < dashUnit + 2.0 )
-                        userLengths[i] = dashUnit + 2.0 ;
-                    else if ( i % 2 == 0 && userLengths[i] < dashUnit )
-                        userLengths[i] = dashUnit ;
+                    if ( i % 2 == 1 && m_userLengths[i] < dashUnit + 2.0 )
+                        m_userLengths[i] = dashUnit + 2.0 ;
+                    else if ( i % 2 == 0 && m_userLengths[i] < dashUnit )
+                        m_userLengths[i] = dashUnit ;

                 }
             }
                 }
             }

-            dashes = userLengths ;
+            m_lengths = m_userLengths ;

         }
         break;
     case wxSTIPPLE :
         {
             /*
         }
         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 );
-                        }
+            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;
             */
         }
         break;


@@ -481,279 +525,633 @@ void wxCairoContext::StrokePath( const wxGraphicsPath *p )
         if ( m_pen.GetStyle() >= wxFIRST_HATCH && m_pen.GetStyle() <= wxLAST_HATCH )
         {
             /*
         if ( m_pen.GetStyle() >= wxFIRST_HATCH && m_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 ;
-             
-                        }
-                        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 )
+            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 ;
+
+            }
+            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;
     }
             */
         }
         break;
     }

+}

 
 

-    cairo_set_dash(m_context,(double*)dashes,num_dashes,offset);
-    if ( userLengths )
-        delete[] userLengths;
-    cairo_stroke(m_context);
-    cairo_path_destroy(cp);
+void wxCairoPen::Apply( wxGraphicsContext* context )
+{
+    cairo_t * ctext = (cairo_t*) context->GetNativeContext();
+    cairo_set_line_width(ctext,m_width);
+    cairo_set_source_rgba(ctext,m_red,m_green, m_blue,m_alpha);
+    cairo_set_line_cap(ctext,m_cap);
+    cairo_set_line_join(ctext,m_join);
+    cairo_set_dash(ctext,(double*)m_lengths,m_count,0.0);

 }
 
 }
 

-void wxCairoContext::FillPath( const wxGraphicsPath *p , int fillStyle )
+//-----------------------------------------------------------------------------
+// wxCairoBrush implementation
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxCairoBrush,wxGraphicsBrush)
+
+wxCairoBrush::wxCairoBrush() : wxGraphicsBrush( NULL )

 {
 {

-    if ( !m_brushTransparent )
-    {
-        const wxCairoPath* path = dynamic_cast< const wxCairoPath*>( p );
-        cairo_path_t* cp = path->GetPath() ;
-        cairo_append_path(m_context,cp);
+    wxLogDebug(wxT("Illegal Constructor called"));
+}

 
 

-        if ( m_brushPattern )
-        {
-            cairo_set_source(m_context,m_brushPattern);
-        }
-        else
-        {
-            cairo_set_source_rgba(m_context,m_brush.GetColour().Red()/255.0,
-                                  m_brush.GetColour().Green()/255.0,
-                                  m_brush.GetColour().Blue()/255.0,
-                                  m_brush.GetColour().Alpha()/255.0);
-        }
+wxCairoBrush::wxCairoBrush( wxGraphicsRenderer* renderer ) : wxGraphicsBrush( renderer )
+{
+    Init();
+}

 
 

-        cairo_set_fill_rule(m_context,fillStyle==wxODDEVEN_RULE ? CAIRO_FILL_RULE_EVEN_ODD : CAIRO_FILL_RULE_WINDING);
-        cairo_fill(m_context);
-        cairo_path_destroy(cp);
+wxCairoBrush::wxCairoBrush( wxGraphicsRenderer* renderer, const wxBrush &brush )
+: wxGraphicsBrush(renderer)
+{
+    m_red = brush.GetColour().Red()/255.0;
+    m_green = brush.GetColour().Green()/255.0; 
+    m_blue = brush.GetColour().Blue()/255.0;
+    m_alpha = brush.GetColour().Alpha()/255.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 ;
+
+    }
+    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);

     }
     }

+    }
+    */

 }
 
 }
 

-wxGraphicsPath* wxCairoContext::CreatePath()
+wxCairoBrush::~wxCairoBrush ()

 {
 {

-    return new wxCairoPath();
+    if (m_brushPattern)
+        cairo_pattern_destroy(m_brushPattern);

 }
 
 }
 

-void wxCairoContext::Rotate( wxDouble angle )
+void wxCairoBrush::Apply( wxGraphicsContext* context )

 {
 {

-    cairo_rotate(m_context,angle);
+    cairo_t * ctext = (cairo_t*) context->GetNativeContext();
+    if ( m_brushPattern )
+    {
+        cairo_set_source(ctext,m_brushPattern);
+    }
+    else
+    {
+        cairo_set_source_rgba(ctext,m_red,m_green, m_blue,m_alpha);
+    }

 }
 
 }
 

-void wxCairoContext::Translate( wxDouble dx , wxDouble dy )
+void wxCairoBrush::CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, 
+        const wxColour&c1, const wxColour&c2 )

 {
 {

-    cairo_translate(m_context,dx,dy);
+    m_brushPattern = cairo_pattern_create_linear(x1,y1,x2,y2);
+    cairo_pattern_add_color_stop_rgba(m_brushPattern,0.0,c1.Red()/255.0,
+        c1.Green()/255.0, c1.Blue()/255.0,c1.Alpha()/255.0);
+    cairo_pattern_add_color_stop_rgba(m_brushPattern,1.0,c2.Red()/255.0,
+        c2.Green()/255.0, c2.Blue()/255.0,c2.Alpha()/255.0);
+    wxASSERT_MSG(cairo_pattern_status(m_brushPattern) == CAIRO_STATUS_SUCCESS, wxT("Couldn't create cairo pattern"));

 }
 
 }
 

-void wxCairoContext::Scale( wxDouble xScale , wxDouble yScale )
+void wxCairoBrush::CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
+        const wxColour &oColor, const wxColour &cColor )

 {
 {

-    cairo_scale(m_context,xScale,yScale);
-    /*
-        PointF penWidth( m_pen->GetWidth(), 0);
-        Matrix matrix ;
-        if ( !m_penTransparent )
-        {
-                m_context->GetTransform(&matrix);
-                matrix.TransformVectors(&penWidth);
-        }
-        m_context->ScaleTransform(xScale,yScale);
-        if ( !m_penTransparent )
-        {
-            m_context->GetTransform(&matrix);
-            matrix.Invert();
-            matrix.TransformVectors(&penWidth) ;
-            m_pen->SetWidth( sqrt( penWidth.X*penWidth.X  + penWidth.Y*penWidth.Y));
-        }
-    */
+    m_brushPattern = cairo_pattern_create_radial(xo,yo,0.0,xc,yc,radius);
+    cairo_pattern_add_color_stop_rgba(m_brushPattern,0.0,oColor.Red()/255.0,
+        oColor.Green()/255.0, oColor.Blue()/255.0,oColor.Alpha()/255.0);
+    cairo_pattern_add_color_stop_rgba(m_brushPattern,1.0,cColor.Red()/255.0,
+        cColor.Green()/255.0, cColor.Blue()/255.0,cColor.Alpha()/255.0);
+    wxASSERT_MSG(cairo_pattern_status(m_brushPattern) == CAIRO_STATUS_SUCCESS, wxT("Couldn't create cairo pattern"));

 }
 
 }
 

-void wxCairoContext::PushState()
+void wxCairoBrush::Init()

 {
 {

-    cairo_save(m_context);
+    m_brushPattern = NULL;

 }
 
 }
 

-void wxCairoContext::PopState()
+//-----------------------------------------------------------------------------
+// wxCairoFont implementation
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxCairoFont,wxGraphicsFont)
+
+wxCairoFont::wxCairoFont() : wxGraphicsFont(NULL)

 {
 {

-    cairo_restore(m_context);
+    wxLogDebug(wxT("Illegal Constructor called"));

 }
 
 }
 

-void wxCairoContext::SetTextColor( const wxColour &col )
+wxCairoFont::wxCairoFont( wxGraphicsRenderer* renderer, const wxFont &font, 
+                         const wxColour& col ) : wxGraphicsFont(renderer)

 {
 {

-    m_textColour = col;
+    m_red = col.Red()/255.0;
+    m_green = col.Green()/255.0; 
+    m_blue = col.Blue()/255.0;
+    m_alpha = col.Alpha()/255.0;
+
+    m_size = font.GetPointSize();
+    m_fontName = font.GetFaceName().mb_str(wxConvUTF8);
+    m_slant = font.GetStyle() == wxFONTSTYLE_ITALIC ? CAIRO_FONT_SLANT_ITALIC:CAIRO_FONT_SLANT_NORMAL;
+    m_weight = font.GetWeight() == wxFONTWEIGHT_BOLD ? CAIRO_FONT_WEIGHT_BOLD:CAIRO_FONT_WEIGHT_NORMAL;

 }
 
 }
 

-void wxCairoContext::SetPen( const wxPen &pen )
+wxCairoFont::~wxCairoFont()

 {
 {

-    m_pen = pen ;
-    m_penTransparent = pen.GetStyle() == wxTRANSPARENT;
-    if ( m_penTransparent )
-        return;
+}

 
 

-    /*
-     
-        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 ;
-     
-                }
-                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);
-    */
+void wxCairoFont::Apply( wxGraphicsContext* context )
+{
+    cairo_t * ctext = (cairo_t*) context->GetNativeContext();
+    cairo_set_source_rgba(ctext,m_red,m_green, m_blue,m_alpha);
+    cairo_select_font_face(ctext,m_fontName,m_slant,m_weight);
+    cairo_set_font_size(ctext,m_size);
+    // TODO UNDERLINE
+    // TODO FIX SIZE
+}
+
+//-----------------------------------------------------------------------------
+// wxCairoPath implementation
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxCairoPath,wxGraphicsPath)
+
+wxCairoPath::wxCairoPath() : wxGraphicsPath(NULL)
+{
+    wxLogDebug(wxT("Illegal Constructor called"));

 }
 
 }
 

-void wxCairoContext::SetBrush( const wxBrush &brush )
+wxCairoPath::wxCairoPath( wxGraphicsRenderer* renderer, cairo_t* pathcontext) 
+    : wxGraphicsPath(renderer)

 {
 {

-    m_brush = brush;
-    if (m_brushPattern)
+    if (pathcontext)

     {
     {

-        cairo_pattern_destroy(m_brushPattern);
-        m_brushPattern = NULL;
+        m_pathContext = pathcontext;

     }
     }

-    m_brushTransparent = brush.GetStyle() == wxTRANSPARENT;
+    else
+    {
+        cairo_surface_t* surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32,1,1);
+        m_pathContext = cairo_create(surface);
+        cairo_surface_destroy (surface);
+    }
+}

 
 

-    if ( m_brushTransparent )
-        return;
-    /*
-        wxDELETE(m_brush);
-     
-        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);
-            }
-        }
-    */
+wxCairoPath::~wxCairoPath()
+{
+    cairo_destroy(m_pathContext);

 }
 
 }
 

-void wxCairoContext::SetLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, const wxColour&c1, const wxColour&c2)
+wxGraphicsPath *wxCairoPath::Clone() const

 {
 {

-    if ( m_brushPattern )
+    cairo_surface_t* surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32,1,1);
+    cairo_t* pathcontext = cairo_create(surface);
+    cairo_surface_destroy (surface);
+
+    cairo_path_t* path = cairo_copy_path(m_pathContext);
+    cairo_append_path(pathcontext, path);
+    cairo_path_destroy(path);
+    return new wxCairoPath( GetRenderer() ,pathcontext);
+}
+
+
+void* wxCairoPath::GetNativePath() const
+{
+    return cairo_copy_path(m_pathContext) ;
+}
+
+void wxCairoPath::UnGetNativePath(void *p)
+{
+    cairo_path_destroy((cairo_path_t*)p);
+}
+
+//
+// The Primitives
+//
+
+void wxCairoPath::MoveToPoint( wxDouble x , wxDouble y )
+{
+    cairo_move_to(m_pathContext,x,y);
+}
+
+void wxCairoPath::AddLineToPoint( wxDouble x , wxDouble y )
+{
+    cairo_line_to(m_pathContext,x,y);
+}
+
+void wxCairoPath::AddPath( const wxGraphicsPath* path )
+{
+    // TODO
+}
+
+void wxCairoPath::CloseSubpath()
+{
+    cairo_close_path(m_pathContext);
+}
+
+void wxCairoPath::AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y )
+{
+    cairo_curve_to(m_pathContext,cx1,cy1,cx2,cy2,x,y);
+}
+
+// gets the last point of the current path, (0,0) if not yet set
+void wxCairoPath::GetCurrentPoint( wxDouble& x, wxDouble&y)
+{
+    double dx,dy;
+    cairo_get_current_point(m_pathContext,&dx,&dy);
+    x = dx;
+    y = dy;
+}
+
+void wxCairoPath::AddArc( wxDouble x, wxDouble y, wxDouble r, double startAngle, double endAngle, bool clockwise )
+{
+    // as clockwise means positive in our system (y pointing downwards) 
+    // TODO make this interpretation dependent of the
+    // real device trans
+    if ( clockwise||(endAngle-startAngle)>=2*M_PI)
+        cairo_arc(m_pathContext,x,y,r,startAngle,endAngle);
+    else
+        cairo_arc_negative(m_pathContext,x,y,r,startAngle,endAngle);
+}
+
+// transforms each point of this path by the matrix
+void wxCairoPath::Transform( wxGraphicsMatrix* matrix ) 
+{
+    // as we don't have a true path object, we have to apply the inverse
+    // matrix to the context
+    cairo_matrix_t m = *((cairo_matrix_t*) matrix->GetNativeMatrix());
+    cairo_matrix_invert( &m );
+    cairo_transform(m_pathContext,&m);
+}   
+
+// gets the bounding box enclosing all points (possibly including control points)
+void wxCairoPath::GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) 
+{
+    double x1,y1,x2,y2;
+
+    cairo_stroke_extents( m_pathContext, &x1, &y1, &x2, &y2 );
+    if ( x2 < x1 )

     {
     {

-        cairo_pattern_destroy(m_brushPattern);
-        m_brushPattern=NULL;
+        *x = x2;
+        *w = x1-x2;
+    }
+    else
+    {
+        *x = x1;
+        *w = x2-x1;

     }
     
     }
     

-    m_brushTransparent = false;
-    m_brushPattern = cairo_pattern_create_linear(x1,y1,x2,y2);
-    cairo_pattern_add_color_stop_rgba(m_brushPattern,0.0,c1.Red()/255.0,
-                          c1.Green()/255.0, c1.Blue()/255.0,c1.Alpha()/255.0);
-    cairo_pattern_add_color_stop_rgba(m_brushPattern,1.0,c2.Red()/255.0,
-                          c2.Green()/255.0, c2.Blue()/255.0,c2.Alpha()/255.0);
-    wxASSERT_MSG(cairo_pattern_status(m_brushPattern) == CAIRO_STATUS_SUCCESS, wxT("Couldn't create cairo pattern"));
+    if( y2 < y1 )
+    {
+        *y = y2;
+        *h = y1-y2;
+    }
+    else
+    {
+        *y = y1;
+        *h = y2-y1;
+    }
+}
+
+bool wxCairoPath::Contains( wxDouble x, wxDouble y, int fillStyle ) 
+{
+    return cairo_in_stroke( m_pathContext, x, y) != NULL;
+}
+
+//-----------------------------------------------------------------------------
+// wxCairoMatrix implementation
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxCairoMatrix,wxGraphicsMatrix)
+
+wxCairoMatrix::wxCairoMatrix() : wxGraphicsMatrix(NULL)
+{
+    wxLogDebug(wxT("Illegal Constructor called"));
+}
+
+wxCairoMatrix::wxCairoMatrix(wxGraphicsRenderer* renderer, const cairo_matrix_t* matrix )
+    : wxGraphicsMatrix(renderer)
+{
+    if ( matrix )
+        m_matrix = *matrix;
+}
+
+wxCairoMatrix::~wxCairoMatrix() 
+{
+    // nothing to do
+}
+
+wxGraphicsMatrix *wxCairoMatrix::Clone() const 
+{
+    return new wxCairoMatrix(GetRenderer(),&m_matrix);
+}
+
+// concatenates the matrix
+void wxCairoMatrix::Concat( const wxGraphicsMatrix *t ) 
+{
+    cairo_matrix_multiply( &m_matrix, &m_matrix, (cairo_matrix_t*) t->GetNativeMatrix());           
+}
+
+// copies the passed in matrix
+void wxCairoMatrix::Copy( const wxGraphicsMatrix *t ) 
+{
+    m_matrix = *((cairo_matrix_t*) t->GetNativeMatrix());
+}
+
+// sets the matrix to the respective values
+void wxCairoMatrix::Set(wxDouble a, wxDouble b, wxDouble c, wxDouble d, 
+                        wxDouble tx, wxDouble ty) 
+{
+    cairo_matrix_init( &m_matrix, a, b, c, d, tx, ty);
+}
+
+// makes this the inverse matrix
+void wxCairoMatrix::Invert() 
+{
+    cairo_matrix_invert( &m_matrix );
+}
+
+// returns true if the elements of the transformation matrix are equal ?
+bool wxCairoMatrix::IsEqual( const wxGraphicsMatrix* t) const  
+{
+    const cairo_matrix_t* tm = (cairo_matrix_t*) t->GetNativeMatrix();
+    return ( 
+        m_matrix.xx == tm->xx && 
+        m_matrix.yx == tm->yx && 
+        m_matrix.xy == tm->xy && 
+        m_matrix.yy == tm->yy && 
+        m_matrix.x0 == tm->x0 && 
+        m_matrix.y0 == tm->y0 ) ;
+}
+
+// return true if this is the identity matrix
+bool wxCairoMatrix::IsIdentity() 
+{
+    return ( m_matrix.xx == 1 && m_matrix.yy == 1 &&
+        m_matrix.yx == 0 && m_matrix.xy == 0 && m_matrix.x0 == 0 && m_matrix.y0 == 0);

 }
 
 }
 

-void wxCairoContext::SetRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
-        const wxColour &oColor, const wxColour &cColor)
+//
+// transformation
+//
+
+// add the translation to this matrix
+void wxCairoMatrix::Translate( wxDouble dx , wxDouble dy ) 

 {
 {

-   if ( m_brushPattern )
+    cairo_matrix_translate( &m_matrix, dx, dy) ;
+}
+
+// add the scale to this matrix
+void wxCairoMatrix::Scale( wxDouble xScale , wxDouble yScale ) 
+{
+    cairo_matrix_scale( &m_matrix, xScale, yScale) ;
+}
+
+// add the rotation to this matrix (radians)
+void wxCairoMatrix::Rotate( wxDouble angle ) 
+{
+    cairo_matrix_rotate( &m_matrix, angle) ;
+}      
+
+//
+// apply the transforms
+//
+
+// applies that matrix to the point
+void wxCairoMatrix::TransformPoint( wxDouble *x, wxDouble *y )
+{
+    double lx = *x, ly = *y ;
+    cairo_matrix_transform_point( &m_matrix, &lx, &ly);
+    *x = lx;
+    *y = ly;
+}
+
+// applies the matrix except for translations
+void wxCairoMatrix::TransformDistance( wxDouble *dx, wxDouble *dy )
+{
+    double lx = *dx, ly = *dy ;
+    cairo_matrix_transform_distance( &m_matrix, &lx, &ly);
+    *dx = lx;
+    *dy = ly;
+}
+
+// returns the native representation
+void * wxCairoMatrix::GetNativeMatrix() const
+{
+    return (void*) &m_matrix;
+}
+
+//-----------------------------------------------------------------------------
+// wxCairoContext implementation
+//-----------------------------------------------------------------------------
+
+wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxWindowDC& dc )
+: wxGraphicsContext(renderer)
+{
+#ifdef __WXGTK__
+    m_context = gdk_cairo_create( dc.m_window ) ;
+#endif
+    PushState();
+    PushState();
+}
+
+#ifdef __WXGTK__
+wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, GdkDrawable *drawable )
+: wxGraphicsContext(renderer)
+{
+    m_context = gdk_cairo_create( drawable ) ;
+    PushState();
+    PushState();
+}
+#endif
+
+wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, cairo_t *context )
+: wxGraphicsContext(renderer)
+{
+    m_context = context ;
+    PushState();
+    PushState();
+}
+
+wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, wxWindow *window)
+: wxGraphicsContext(renderer)
+{
+#ifdef __WXGTK__
+    // something along these lines (copied from dcclient)
+
+    GtkWidget *widget = window->m_wxwindow;
+
+    // Some controls don't have m_wxwindow - like wxStaticBox, but the user
+    // code should still be able to create wxClientDCs for them, so we will
+    // use the parent window here then.
+    if ( !widget )

     {
     {

-        cairo_pattern_destroy(m_brushPattern);
-        m_brushPattern=NULL;
+        window = window->GetParent();
+        widget = window->m_wxwindow;

     }
     }

-    
-    m_brushTransparent = false;
-    m_brushPattern = cairo_pattern_create_radial(xo,yo,0.0,xc,yc,radius);
-    cairo_pattern_add_color_stop_rgba(m_brushPattern,0.0,oColor.Red()/255.0,
-                          oColor.Green()/255.0, oColor.Blue()/255.0,oColor.Alpha()/255.0);
-    cairo_pattern_add_color_stop_rgba(m_brushPattern,1.0,cColor.Red()/255.0,
-                          cColor.Green()/255.0, cColor.Blue()/255.0,cColor.Alpha()/255.0);
-    wxASSERT_MSG(cairo_pattern_status(m_brushPattern) == CAIRO_STATUS_SUCCESS, wxT("Couldn't create cairo pattern"));
- }
+
+    wxASSERT_MSG( widget, wxT("wxCairoContext needs a widget") );
+
+    GtkPizza *pizza = GTK_PIZZA( widget );
+    GdkDrawable* drawable = pizza->bin_window;
+    m_context = gdk_cairo_create( drawable ) ;
+#endif
+    PushState();
+    PushState();
+}
+
+wxCairoContext::~wxCairoContext()
+{
+    SetPen(NULL);
+    SetBrush(NULL);
+    SetFont(NULL);
+
+    if ( m_context )
+    {
+        PopState();
+        PopState();
+        cairo_destroy(m_context);
+    }
+}
+
+
+void wxCairoContext::Clip( const wxRegion & WXUNUSED(region) )
+{
+// TODO
+}
+
+void wxCairoContext::Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h )
+{
+// TODO
+}
+
+void wxCairoContext::ResetClip()
+{
+// TODO
+}
+
+
+void wxCairoContext::StrokePath( const wxGraphicsPath *path )
+{
+    if ( m_pen )
+    {   
+        cairo_path_t* cp = (cairo_path_t*) path->GetNativePath() ;
+        cairo_append_path(m_context,cp);
+        m_pen->Apply(this);
+        cairo_stroke(m_context);
+        wxConstCast(path, wxGraphicsPath)->UnGetNativePath(cp);
+    }
+}
+
+void wxCairoContext::FillPath( const wxGraphicsPath *path , int fillStyle )
+{
+    if ( m_brush )
+    {
+        cairo_path_t* cp = (cairo_path_t*) path->GetNativePath() ;
+        cairo_append_path(m_context,cp);
+        m_brush->Apply(this);
+        cairo_set_fill_rule(m_context,fillStyle==wxODDEVEN_RULE ? CAIRO_FILL_RULE_EVEN_ODD : CAIRO_FILL_RULE_WINDING);
+        cairo_fill(m_context);
+        wxConstCast(path, wxGraphicsPath)->UnGetNativePath(cp);
+    }
+}
+
+void wxCairoContext::Rotate( wxDouble angle )
+{
+    cairo_rotate(m_context,angle);
+}
+
+void wxCairoContext::Translate( wxDouble dx , wxDouble dy )
+{
+    cairo_translate(m_context,dx,dy);
+}
+
+void wxCairoContext::Scale( wxDouble xScale , wxDouble yScale )
+{
+    cairo_scale(m_context,xScale,yScale);
+}
+
+// concatenates this transform with the current transform of this context
+void wxCairoContext::ConcatTransform( const wxGraphicsMatrix* matrix )
+{
+    cairo_transform(m_context,(const cairo_matrix_t *) matrix->GetNativeMatrix());
+}
+
+// sets the transform of this context
+void wxCairoContext::SetTransform( const wxGraphicsMatrix* matrix )
+{
+    cairo_set_matrix(m_context,(const cairo_matrix_t*) matrix->GetNativeMatrix());
+}
+
+// gets the matrix of this context
+void wxCairoContext::GetTransform( wxGraphicsMatrix* matrix )
+{
+    cairo_get_matrix(m_context,(cairo_matrix_t*) matrix->GetNativeMatrix());
+}
+
+
+
+void wxCairoContext::PushState()
+{
+    cairo_save(m_context);
+}
+
+void wxCairoContext::PopState()
+{
+    cairo_restore(m_context);
+}

 
 void wxCairoContext::DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h )
 {
 
 void wxCairoContext::DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h )
 {


@@ -776,64 +1174,18 @@ void wxCairoContext::DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDou
 
 void wxCairoContext::DrawText( const wxString &str, wxDouble x, wxDouble y )
 {
 
 void wxCairoContext::DrawText( const wxString &str, wxDouble x, wxDouble y )
 {

-    if ( str.IsEmpty())
+    if ( m_font == NULL || str.IsEmpty())

         return ;
     cairo_move_to(m_context,x,y);
     const wxWX2MBbuf buf(str.mb_str(wxConvUTF8));
         return ;
     cairo_move_to(m_context,x,y);
     const wxWX2MBbuf buf(str.mb_str(wxConvUTF8));

-
-    cairo_set_source_rgba(m_context,m_textColour.Red()/255.0,
-                          m_textColour.Green()/255.0, m_textColour.Blue()/255.0,m_textColour.Alpha()/255.0);
+    m_font->Apply(this);

     cairo_show_text(m_context,buf);
     cairo_show_text(m_context,buf);

-
-    // TODO m_backgroundMode == wxSOLID

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

-    /*
-        wxWCharBuffer s = str.wc_str( *wxConvUI );
-        FontFamily ffamily ;
-        
-        m_font->GetFamily(&ffamily) ;
-     
-        REAL factorY = m_context->GetDpiY() / 72.0 ;
-     
-        REAL rDescent = ffamily.GetCellDescent(FontStyleRegular) *
-            m_font->GetSize() / ffamily.GetEmHeight(FontStyleRegular);
-        REAL rAscent = ffamily.GetCellAscent(FontStyleRegular) *
-            m_font->GetSize() / ffamily.GetEmHeight(FontStyleRegular);
-        REAL rHeight = ffamily.GetLineSpacing(FontStyleRegular) *
-            m_font->GetSize() / ffamily.GetEmHeight(FontStyleRegular);
-     
-        if ( height )
-            *height = rHeight * factorY + 0.5 ;
-        if ( descent )
-            *descent = rDescent * factorY + 0.5 ;
-        if ( externalLeading )
-            *externalLeading = (rHeight - rAscent - rDescent) * factorY + 0.5 ;
-        // measuring empty strings is not guaranteed, so do it by hand
-        if ( str.IsEmpty()) 
-        {
-            if ( width )
-                *width = 0 ;
-        }
-        else
-        {
-            // MeasureString does return a rectangle that is way too large, so it is
-            // not usable here
-            RectF layoutRect(0,0, 100000.0f, 100000.0f);
-            StringFormat strFormat;
-            CharacterRange strRange(0,wcslen(s));
-            strFormat.SetMeasurableCharacterRanges(1,&strRange);
-            Region region ;
-            m_context->MeasureCharacterRanges(s, -1 , m_font,layoutRect, &strFormat,1,&region) ;
-            RectF bbox ;
-            region.GetBounds(&bbox,m_context);
-            if ( width )
-                *width = bbox.GetRight()-bbox.GetLeft()+0.5;
-        }
-    */
+    // TODO

 }
 
 void wxCairoContext::GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const
 }
 
 void wxCairoContext::GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const


@@ -843,62 +1195,167 @@ void wxCairoContext::GetPartialTextExtents(const wxString& text, wxArrayDouble&
 
     if (text.empty())
         return;
 
     if (text.empty())
         return;

-    /*
-        wxWCharBuffer ws = text.wc_str( *wxConvUI );
-        size_t len = wcslen( ws ) ;
-        wxASSERT_MSG(text.length() == len , wxT("GetPartialTextExtents not yet implemented for multichar situations"));
-     
-        RectF layoutRect(0,0, 100000.0f, 100000.0f);
-        StringFormat strFormat;
-     
-        CharacterRange* ranges = new CharacterRange[len] ;
-        Region* regions = new Region[len];
-        for( int i = 0 ; i < len ; ++i)
-        {
-            ranges[i].First = i ;
-            ranges[i].Length = 1 ;
-        }
-        strFormat.SetMeasurableCharacterRanges(len,ranges);
-        m_context->MeasureCharacterRanges(ws, -1 , m_font,layoutRect, &strFormat,1,regions) ;
-     
-        RectF bbox ;
-        for ( int i = 0 ; i < len ; ++i)
-        {
-            regions[i].GetBounds(&bbox,m_context);
-            widths[i] = bbox.GetRight()-bbox.GetLeft();
-        }
-    */
+
+    // TODO

 }
 
 }
 

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

 {
 {

-    cairo_select_font_face(m_context,font.GetFaceName().mb_str(wxConvUTF8),
-                           font.GetStyle() == wxFONTSTYLE_ITALIC ? CAIRO_FONT_SLANT_ITALIC:CAIRO_FONT_SLANT_NORMAL,
-                           font.GetWeight() == wxFONTWEIGHT_BOLD ? CAIRO_FONT_WEIGHT_BOLD:CAIRO_FONT_WEIGHT_NORMAL);
+    return m_context;
+}

 
 

-    cairo_set_font_size(m_context,font.GetPointSize());
-    // TODO UNDERLINE
-    // TODO FIX SIZE
+//-----------------------------------------------------------------------------
+// wxCairoRenderer declaration
+//-----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_CORE wxCairoRenderer : public wxGraphicsRenderer
+{
+public :
+    wxCairoRenderer() {}
+
+    virtual ~wxCairoRenderer() {}
+
+    // 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 ) ;
+
+private :
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxCairoRenderer)
+} ;
+
+//-----------------------------------------------------------------------------
+// wxCairoRenderer implementation
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxCairoRenderer,wxGraphicsRenderer)
+
+static wxCairoRenderer gs_cairoGraphicsRenderer;
+
+#ifdef __WXGTK__
+wxGraphicsRenderer* wxGraphicsRenderer::GetDefaultRenderer()
+{
+    return &gs_cairoGraphicsRenderer;

 }
 }

+#endif
+
+wxGraphicsContext * wxCairoRenderer::CreateContext( const wxWindowDC& dc)
+{
+    return new wxCairoContext(this,dc);
+}
+
+wxGraphicsContext * wxCairoRenderer::CreateContextFromNativeContext( void * context )
+{
+    return new wxCairoContext(this,(cairo_t*)context);
+}
+
+
+wxGraphicsContext * wxCairoRenderer::CreateContextFromNativeWindow( void * window )
+{
+#ifdef __WXGTK__
+    return new wxCairoContext(this,(GdkDrawable*)window);
+#else
+    return NULL;
+#endif
+}
+
+wxGraphicsContext * wxCairoRenderer::CreateContext( wxWindow* window )
+{
+    return new wxCairoContext(this, window );
+}
+
+// Path
+
+wxGraphicsPath * wxCairoRenderer::CreatePath()
+{
+    return new wxCairoPath( this );
+}
+
+
+// Matrix
+
+wxGraphicsMatrix * wxCairoRenderer::CreateMatrix( wxDouble a, wxDouble b, wxDouble c, wxDouble d, 
+                                                           wxDouble tx, wxDouble ty)

 
 

-void * wxCairoContext::GetNativeContext() 

 {
 {

-       return m_context;
+    wxCairoMatrix* m = new wxCairoMatrix( this );
+    m->Set( a,b,c,d,tx,ty ) ;
+    return m;

 }
 
 }
 

-wxGraphicsContext* wxGraphicsContext::Create( const wxWindowDC& dc )
+wxGraphicsPen* wxCairoRenderer::CreatePen(const wxPen& pen) 

 {
 {

-    return new wxCairoContext(dc);
+    if ( !pen.Ok() || pen.GetStyle() == wxTRANSPARENT )
+        return NULL;
+    else
+        return new wxCairoPen( this, pen );

 }
 
 }
 

-wxGraphicsContext* wxGraphicsContext::Create( wxWindow * window )
+wxGraphicsBrush* wxCairoRenderer::CreateBrush(const wxBrush& brush ) 

 {
 {

-       return NULL; // TODO
+    if ( !brush.Ok() || brush.GetStyle() == wxTRANSPARENT )
+        return NULL;
+    else
+        return new wxCairoBrush( this, brush );

 }
 
 }
 

-wxGraphicsContext* wxGraphicsContext::CreateFromNative( void * context )
+// sets the brush to a linear gradient, starting at (x1,y1) with color c1 to (x2,y2) with color c2
+wxGraphicsBrush* wxCairoRenderer::CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, 
+                                                                      const wxColour&c1, const wxColour&c2) 

 {
 {

-       return NULL; // TODO
+    wxCairoBrush* brush = new wxCairoBrush(this);
+    brush->CreateLinearGradientBrush(x1, y1, x2, y2, c1, c2);
+    return brush;
+}
+
+// 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* wxCairoRenderer::CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
+                                                                      const wxColour &oColor, const wxColour &cColor) 
+{
+    wxCairoBrush* brush = new wxCairoBrush(this);
+    brush->CreateRadialGradientBrush(xo,yo,xc,yc,radius,oColor,cColor);
+    return brush;
+}
+
+// sets the font
+wxGraphicsFont* wxCairoRenderer::CreateFont( const wxFont &font , const wxColour &col ) 
+{
+    if ( font.Ok() )
+        return new wxCairoFont( this , font, col );
+    else
+        return NULL;

 }
 
 #endif  // wxUSE_GRAPHICS_CONTEXT
 }
 
 #endif  // wxUSE_GRAPHICS_CONTEXT