PCH-less build fix by Tim S

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

diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp
index df232c1db3828a5b6a12f96269b90f570d85f922..12f147147dc6d2af3111d1b37dc73d0240f3fdf9 100644 (file)
--- a/src/generic/graphicc.cpp
+++ b/src/generic/graphicc.cpp
@@ -12,33 +12,24 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_GRAPHICS_CONTEXT
 
 #endif
 
 #if wxUSE_GRAPHICS_CONTEXT
 

-#include "wx/dc.h"
-

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include "wx/image.h"
-#include "wx/window.h"
-#include "wx/dc.h"
-#include "wx/utils.h"
-#include "wx/dialog.h"
-#include "wx/app.h"
-#include "wx/bitmap.h"
-#include "wx/dcmemory.h"
-#include "wx/log.h"
-#include "wx/icon.h"
-#include "wx/dcprint.h"
-#include "wx/module.h"
+    #include "wx/bitmap.h"
+    #include "wx/icon.h"
+
+    #include "wx/dc.h"
+    #include "wx/dcclient.h"
+    #include "wx/dcmemory.h"
+    #include "wx/dcprint.h"

 #endif
 
 #endif
 

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

 #include "wx/rawbmp.h"
 
 #include "wx/rawbmp.h"
 

-#include <vector>
-

 using namespace std;
 
 //-----------------------------------------------------------------------------
 using namespace std;
 
 //-----------------------------------------------------------------------------


@@ -99,6 +90,7 @@ static inline double RadToDeg(double deg)
 #ifdef __WXGTK__
 #include <gtk/gtk.h>
 #include "wx/fontutil.h"
 #ifdef __WXGTK__
 #include <gtk/gtk.h>
 #include "wx/fontutil.h"

+#include "wx/gtk/dc.h"

 #endif
 
 #ifdef __WXMSW__
 #endif
 
 #ifdef __WXMSW__


@@ -106,7 +98,7 @@ static inline double RadToDeg(double deg)
 #endif
 
 #ifdef __WXMAC__
 #endif
 
 #ifdef __WXMAC__

-#include "wx/mac/private.h"
+#include "wx/osx/private.h"

 #include <cairo-quartz.h>
 #include <cairo-atsui.h>
 #endif
 #include <cairo-quartz.h>
 #include <cairo-atsui.h>
 #endif


@@ -152,7 +144,7 @@ public :
 
     /*
 
 
     /*
 

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

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


@@ -173,7 +165,7 @@ public :
     // gets the bounding box enclosing all points (possibly including control points)
     virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const;
 
     // 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 = wxWINDING_RULE) const;
+    virtual bool Contains( wxDouble x, wxDouble y, wxPolygonFillMode fillStyle = wxWINDING_RULE) const;

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


@@ -191,13 +183,13 @@ public :
     virtual void Concat( const wxGraphicsMatrixData *t );
 
     // sets the matrix to the respective values
     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, 
+    virtual void Set(wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0,

         wxDouble tx=0.0, wxDouble ty=0.0);
 
     // gets the component valuess of the matrix
     virtual void Get(wxDouble* a=NULL, wxDouble* b=NULL,  wxDouble* c=NULL,
                      wxDouble* d=NULL, wxDouble* tx=NULL, wxDouble* ty=NULL) const;
         wxDouble tx=0.0, wxDouble ty=0.0);
 
     // gets the component valuess of the matrix
     virtual void Get(wxDouble* a=NULL, wxDouble* b=NULL,  wxDouble* c=NULL,
                      wxDouble* d=NULL, wxDouble* tx=NULL, wxDouble* ty=NULL) const;

-       
+

     // makes this the inverse matrix
     virtual void Invert();
 
     // makes this the inverse matrix
     virtual void Invert();
 


@@ -218,7 +210,7 @@ public :
     virtual void Scale( wxDouble xScale , wxDouble yScale );
 
     // add the rotation to this matrix (radians)
     virtual void Scale( wxDouble xScale , wxDouble yScale );
 
     // add the rotation to this matrix (radians)

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

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


@@ -249,12 +241,12 @@ public:
 
 private :
     double m_width;
 
 private :
     double m_width;

-    
+

     double m_red;
     double m_green;
     double m_blue;
     double m_alpha;
     double m_red;
     double m_green;
     double m_blue;
     double m_alpha;

-    
+

     cairo_line_cap_t m_cap;
     cairo_line_join_t m_join;
 
     cairo_line_cap_t m_cap;
     cairo_line_join_t m_join;
 


@@ -273,7 +265,7 @@ public:
     ~wxCairoBrushData ();
 
     virtual void Apply( wxGraphicsContext* context );
     ~wxCairoBrushData ();
 
     virtual void Apply( wxGraphicsContext* context );

-    void CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, 
+    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 );
         const wxColour&c1, const wxColour&c2 );
     void CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
         const wxColour &oColor, const wxColour &cColor );


@@ -299,9 +291,11 @@ public:
     virtual void Apply( wxGraphicsContext* context );
 #ifdef __WXGTK__
     const PangoFontDescription* GetFont() const { return m_font; }
     virtual void Apply( wxGraphicsContext* context );
 #ifdef __WXGTK__
     const PangoFontDescription* GetFont() const { return m_font; }

+    bool GetUnderlined() const { return m_underlined; }

 #endif
 private :
     double m_size;
 #endif
 private :
     double m_size;

+    bool m_underlined;

     double m_red;
     double m_green;
     double m_blue;
     double m_red;
     double m_green;
     double m_blue;


@@ -319,10 +313,10 @@ private :
 
 class WXDLLIMPEXP_CORE wxCairoContext : public wxGraphicsContext
 {
 
 class WXDLLIMPEXP_CORE wxCairoContext : public wxGraphicsContext
 {

-    DECLARE_NO_COPY_CLASS(wxCairoContext)
-

 public:
     wxCairoContext( wxGraphicsRenderer* renderer, const wxWindowDC& dc );
 public:
     wxCairoContext( wxGraphicsRenderer* renderer, const wxWindowDC& dc );

+    wxCairoContext( wxGraphicsRenderer* renderer, const wxMemoryDC& dc );
+    wxCairoContext( wxGraphicsRenderer* renderer, const wxPrinterDC& dc );

 #ifdef __WXGTK__
     wxCairoContext( wxGraphicsRenderer* renderer, GdkDrawable *drawable );
 #endif
 #ifdef __WXGTK__
     wxCairoContext( wxGraphicsRenderer* renderer, GdkDrawable *drawable );
 #endif


@@ -332,7 +326,7 @@ public:
     virtual ~wxCairoContext();
 
     virtual bool ShouldOffset() const
     virtual ~wxCairoContext();
 
     virtual bool ShouldOffset() const

-    {     
+    {

         int penwidth = 0 ;
         if ( !m_pen.IsNull() )
         {
         int penwidth = 0 ;
         if ( !m_pen.IsNull() )
         {


@@ -353,8 +347,16 @@ public:
 
     virtual void * GetNativeContext();
 
 
     virtual void * GetNativeContext();
 

+    virtual bool SetAntialiasMode(wxAntialiasMode antialias);
+
+    virtual bool SetCompositionMode(wxCompositionMode op);
+
+    virtual void BeginLayer(wxDouble opacity);
+
+    virtual void EndLayer();
+    

     virtual void StrokePath( const wxGraphicsPath& p );
     virtual void StrokePath( const wxGraphicsPath& p );

-    virtual void FillPath( const wxGraphicsPath& p , int fillStyle = wxWINDING_RULE );
+    virtual void FillPath( const wxGraphicsPath& p , wxPolygonFillMode fillStyle = wxWINDING_RULE );

 
     virtual void Translate( wxDouble dx , wxDouble dy );
     virtual void Scale( wxDouble xScale , wxDouble yScale );
 
     virtual void Translate( wxDouble dx , wxDouble dy );
     virtual void Scale( wxDouble xScale , wxDouble yScale );


@@ -374,15 +376,20 @@ public:
     virtual void PushState();
     virtual void PopState();
 
     virtual void PushState();
     virtual void PopState();
 

-    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(cairo_t *context);
     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(cairo_t *context);

-    
+
+    virtual void DoDrawText( const wxString &str, wxDouble x, wxDouble y );
+

     cairo_t* m_context;
     cairo_t* m_context;

+    
+    wxVector<float> m_layerOpacities;
+
+    wxDECLARE_NO_COPY_CLASS(wxCairoContext);

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


@@ -404,7 +411,7 @@ void wxCairoPenData::Init()
 
 wxCairoPenData::wxCairoPenData( wxGraphicsRenderer* renderer, const wxPen &pen )
 : wxGraphicsObjectRefData(renderer)
 
 wxCairoPenData::wxCairoPenData( wxGraphicsRenderer* renderer, const wxPen &pen )
 : wxGraphicsObjectRefData(renderer)

-{    
+{

     Init();
     m_pen = pen;
     m_width = m_pen.GetWidth();
     Init();
     m_pen = pen;
     m_width = m_pen.GetWidth();


@@ -412,7 +419,7 @@ wxCairoPenData::wxCairoPenData( wxGraphicsRenderer* renderer, const wxPen &pen )
         m_width = 0.1;
 
     m_red = m_pen.GetColour().Red()/255.0;
         m_width = 0.1;
 
     m_red = m_pen.GetColour().Red()/255.0;

-    m_green = m_pen.GetColour().Green()/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;
 
     m_blue = m_pen.GetColour().Blue()/255.0;
     m_alpha = m_pen.GetColour().Alpha()/255.0;
 


@@ -474,32 +481,32 @@ wxCairoPenData::wxCairoPenData( wxGraphicsRenderer* renderer, const wxPen &pen )
 
     switch ( m_pen.GetStyle() )
     {
 
     switch ( m_pen.GetStyle() )
     {

-    case wxSOLID :
+    case wxPENSTYLE_SOLID :

         break;
 
         break;
 

-    case wxDOT :
+    case wxPENSTYLE_DOT :

         m_count = WXSIZEOF(dotted);
         m_userLengths = new double[ m_count ] ;
         memcpy( m_userLengths, dotted, sizeof(dotted) );
         m_lengths = m_userLengths;
         break;
 
         m_count = WXSIZEOF(dotted);
         m_userLengths = new double[ m_count ] ;
         memcpy( m_userLengths, dotted, sizeof(dotted) );
         m_lengths = m_userLengths;
         break;
 

-    case wxLONG_DASH :
+    case wxPENSTYLE_LONG_DASH :

         m_lengths = dashed ;
         m_count = WXSIZEOF(dashed);
         break;
 
         m_lengths = dashed ;
         m_count = WXSIZEOF(dashed);
         break;
 

-    case wxSHORT_DASH :
+    case wxPENSTYLE_SHORT_DASH :

         m_lengths = short_dashed ;
         m_count = WXSIZEOF(short_dashed);
         break;
 
         m_lengths = short_dashed ;
         m_count = WXSIZEOF(short_dashed);
         break;
 

-    case wxDOT_DASH :
+    case wxPENSTYLE_DOT_DASH :

         m_lengths = dotted_dashed ;
         m_count = WXSIZEOF(dotted_dashed);
         break;
 
         m_lengths = dotted_dashed ;
         m_count = WXSIZEOF(dotted_dashed);
         break;
 

-    case wxUSER_DASH :
+    case wxPENSTYLE_USER_DASH :

         {
             wxDash *wxdashes ;
             m_count = m_pen.GetDashes( &wxdashes ) ;
         {
             wxDash *wxdashes ;
             m_count = m_pen.GetDashes( &wxdashes ) ;


@@ -519,7 +526,7 @@ wxCairoPenData::wxCairoPenData( wxGraphicsRenderer* renderer, const wxPen &pen )
             m_lengths = m_userLengths ;
         }
         break;
             m_lengths = m_userLengths ;
         }
         break;

-    case wxSTIPPLE :
+    case wxPENSTYLE_STIPPLE :

         {
             /*
             wxBitmap* bmp = pen.GetStipple();
         {
             /*
             wxBitmap* bmp = pen.GetStipple();


@@ -535,29 +542,30 @@ wxCairoPenData::wxCairoPenData( wxGraphicsRenderer* renderer, const wxPen &pen )
         }
         break;
     default :
         }
         break;
     default :

-        if ( m_pen.GetStyle() >= wxFIRST_HATCH && m_pen.GetStyle() <= wxLAST_HATCH )
+        if ( m_pen.GetStyle() >= wxPENSTYLE_FIRST_HATCH
+            && m_pen.GetStyle() <= wxPENSTYLE_LAST_HATCH )

         {
             /*
             wxDELETE( m_penBrush );
             HatchStyle style = HatchStyleHorizontal;
             switch( pen.GetStyle() )
             {
         {
             /*
             wxDELETE( m_penBrush );
             HatchStyle style = HatchStyleHorizontal;
             switch( pen.GetStyle() )
             {

-            case wxBDIAGONAL_HATCH :
+            case wxPENSTYLE_BDIAGONAL_HATCH :

             style = HatchStyleBackwardDiagonal;
             break ;
             style = HatchStyleBackwardDiagonal;
             break ;

-            case wxCROSSDIAG_HATCH :
+            case wxPENSTYLE_CROSSDIAG_HATCH :

             style = HatchStyleDiagonalCross;
             break ;
             style = HatchStyleDiagonalCross;
             break ;

-            case wxFDIAGONAL_HATCH :
+            case wxPENSTYLE_FDIAGONAL_HATCH :

             style = HatchStyleForwardDiagonal;
             break ;
             style = HatchStyleForwardDiagonal;
             break ;

-            case wxCROSS_HATCH :
+            case wxPENSTYLE_CROSS_HATCH :

             style = HatchStyleCross;
             break ;
             style = HatchStyleCross;
             break ;

-            case wxHORIZONTAL_HATCH :
+            case wxPENSTYLE_HORIZONTAL_HATCH :

             style = HatchStyleHorizontal;
             break ;
             style = HatchStyleHorizontal;
             break ;

-            case wxVERTICAL_HATCH :
+            case wxPENSTYLE_VERTICAL_HATCH :

             style = HatchStyleVertical;
             break ;
 
             style = HatchStyleVertical;
             break ;
 


@@ -595,13 +603,13 @@ wxCairoBrushData::wxCairoBrushData( wxGraphicsRenderer* renderer, const wxBrush
   : wxGraphicsObjectRefData(renderer)
 {
     Init();
   : wxGraphicsObjectRefData(renderer)
 {
     Init();

-    
+

     m_red = brush.GetColour().Red()/255.0;
     m_red = brush.GetColour().Red()/255.0;

-    m_green = brush.GetColour().Green()/255.0; 
+    m_green = brush.GetColour().Green()/255.0;

     m_blue = brush.GetColour().Blue()/255.0;
     m_alpha = brush.GetColour().Alpha()/255.0;
     /*
     m_blue = brush.GetColour().Blue()/255.0;
     m_alpha = brush.GetColour().Alpha()/255.0;
     /*

-    if ( brush.GetStyle() == wxSOLID)
+    if ( brush.GetStyle() == wxBRUSHSTYLE_SOLID)

     {
     m_brush = new SolidBrush( Color( brush.GetColour().Alpha() , brush.GetColour().Red() ,
     brush.GetColour().Green() , brush.GetColour().Blue() ) );
     {
     m_brush = new SolidBrush( Color( brush.GetColour().Alpha() , brush.GetColour().Red() ,
     brush.GetColour().Green() , brush.GetColour().Blue() ) );


@@ -611,22 +619,22 @@ wxCairoBrushData::wxCairoBrushData( wxGraphicsRenderer* renderer, const wxBrush
     HatchStyle style = HatchStyleHorizontal;
     switch( brush.GetStyle() )
     {
     HatchStyle style = HatchStyleHorizontal;
     switch( brush.GetStyle() )
     {

-    case wxBDIAGONAL_HATCH :
+    case wxBRUSHSTYLE_BDIAGONAL_HATCH :

     style = HatchStyleBackwardDiagonal;
     break ;
     style = HatchStyleBackwardDiagonal;
     break ;

-    case wxCROSSDIAG_HATCH :
+    case wxBRUSHSTYLE_CROSSDIAG_HATCH :

     style = HatchStyleDiagonalCross;
     break ;
     style = HatchStyleDiagonalCross;
     break ;

-    case wxFDIAGONAL_HATCH :
+    case wxBRUSHSTYLE_FDIAGONAL_HATCH :

     style = HatchStyleForwardDiagonal;
     break ;
     style = HatchStyleForwardDiagonal;
     break ;

-    case wxCROSS_HATCH :
+    case wxBRUSHSTYLE_CROSS_HATCH :

     style = HatchStyleCross;
     break ;
     style = HatchStyleCross;
     break ;

-    case wxHORIZONTAL_HATCH :
+    case wxBRUSHSTYLE_HORIZONTAL_HATCH :

     style = HatchStyleHorizontal;
     break ;
     style = HatchStyleHorizontal;
     break ;

-    case wxVERTICAL_HATCH :
+    case wxBRUSHSTYLE_VERTICAL_HATCH :

     style = HatchStyleVertical;
     break ;
 
     style = HatchStyleVertical;
     break ;
 


@@ -634,7 +642,7 @@ wxCairoBrushData::wxCairoBrushData( wxGraphicsRenderer* renderer, const wxBrush
     m_brush = new HatchBrush(style,Color( brush.GetColour().Alpha() , brush.GetColour().Red() ,
     brush.GetColour().Green() , brush.GetColour().Blue() ), Color.Transparent );
     }
     m_brush = new HatchBrush(style,Color( brush.GetColour().Alpha() , brush.GetColour().Red() ,
     brush.GetColour().Green() , brush.GetColour().Blue() ), Color.Transparent );
     }

-    else 
+    else

     {
     wxBitmap* bmp = brush.GetStipple();
     if ( bmp && bmp->Ok() )
     {
     wxBitmap* bmp = brush.GetStipple();
     if ( bmp && bmp->Ok() )


@@ -666,7 +674,7 @@ void wxCairoBrushData::Apply( wxGraphicsContext* context )
     }
 }
 
     }
 }
 

-void wxCairoBrushData::CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, 
+void wxCairoBrushData::CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2,

         const wxColour&c1, const wxColour&c2 )
 {
     m_brushPattern = cairo_pattern_create_linear(x1,y1,x2,y2);
         const wxColour&c1, const wxColour&c2 )
 {
     m_brushPattern = cairo_pattern_create_linear(x1,y1,x2,y2);


@@ -697,14 +705,15 @@ void wxCairoBrushData::Init()
 // wxCairoFontData implementation
 //-----------------------------------------------------------------------------
 
 // wxCairoFontData implementation
 //-----------------------------------------------------------------------------
 

-wxCairoFontData::wxCairoFontData( wxGraphicsRenderer* renderer, const wxFont &font, 
+wxCairoFontData::wxCairoFontData( wxGraphicsRenderer* renderer, const wxFont &font,

                          const wxColour& col ) : wxGraphicsObjectRefData(renderer)
 {
     m_red = col.Red()/255.0;
                          const wxColour& col ) : wxGraphicsObjectRefData(renderer)
 {
     m_red = col.Red()/255.0;

-    m_green = col.Green()/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_blue = col.Blue()/255.0;
     m_alpha = col.Alpha()/255.0;
     m_size = font.GetPointSize();

+    m_underlined = font.GetUnderlined();

 
 #ifdef __WXMAC__
     m_font = cairo_atsui_font_face_create_for_atsu_font_id( font.MacGetATSUFontID() );
 
 #ifdef __WXMAC__
     m_font = cairo_atsui_font_face_create_for_atsu_font_id( font.MacGetATSUFontID() );


@@ -833,7 +842,7 @@ void wxCairoPathData::GetCurrentPoint( wxDouble* x, wxDouble* y) const
 
 void wxCairoPathData::AddArc( wxDouble x, wxDouble y, wxDouble r, double startAngle, double endAngle, bool clockwise )
 {
 
 void wxCairoPathData::AddArc( wxDouble x, wxDouble y, wxDouble r, double startAngle, double endAngle, bool clockwise )
 {

-    // as clockwise means positive in our system (y pointing downwards) 
+    // 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)
     // TODO make this interpretation dependent of the
     // real device trans
     if ( clockwise||(endAngle-startAngle)>=2*M_PI)


@@ -843,14 +852,14 @@ void wxCairoPathData::AddArc( wxDouble x, wxDouble y, wxDouble r, double startAn
 }
 
 // transforms each point of this path by the matrix
 }
 
 // transforms each point of this path by the matrix

-void wxCairoPathData::Transform( const wxGraphicsMatrixData* matrix ) 
+void wxCairoPathData::Transform( const wxGraphicsMatrixData* 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);
 {
     // 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 wxCairoPathData::GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const
 
 // gets the bounding box enclosing all points (possibly including control points)
 void wxCairoPathData::GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const


@@ -868,7 +877,7 @@ void wxCairoPathData::GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h)
         *x = x1;
         *w = x2-x1;
     }
         *x = x1;
         *w = x2-x1;
     }

-    
+

     if( y2 < y1 )
     {
         *y = y2;
     if( y2 < y1 )
     {
         *y = y2;


@@ -881,7 +890,7 @@ void wxCairoPathData::GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h)
     }
 }
 
     }
 }
 

-bool wxCairoPathData::Contains( wxDouble x, wxDouble y, int WXUNUSED(fillStyle) ) const
+bool wxCairoPathData::Contains( wxDouble x, wxDouble y, wxPolygonFillMode WXUNUSED(fillStyle) ) const

 {
     return cairo_in_stroke( m_pathContext, x, y) != 0;
 }
 {
     return cairo_in_stroke( m_pathContext, x, y) != 0;
 }


@@ -897,25 +906,25 @@ wxCairoMatrixData::wxCairoMatrixData(wxGraphicsRenderer* renderer, const cairo_m
         m_matrix = *matrix;
 }
 
         m_matrix = *matrix;
 }
 

-wxCairoMatrixData::~wxCairoMatrixData() 
+wxCairoMatrixData::~wxCairoMatrixData()

 {
     // nothing to do
 }
 
 {
     // nothing to do
 }
 

-wxGraphicsObjectRefData *wxCairoMatrixData::Clone() const 
+wxGraphicsObjectRefData *wxCairoMatrixData::Clone() const

 {
     return new wxCairoMatrixData(GetRenderer(),&m_matrix);
 }
 
 // concatenates the matrix
 {
     return new wxCairoMatrixData(GetRenderer(),&m_matrix);
 }
 
 // concatenates the matrix

-void wxCairoMatrixData::Concat( const wxGraphicsMatrixData *t ) 
+void wxCairoMatrixData::Concat( const wxGraphicsMatrixData *t )

 {
 {

-    cairo_matrix_multiply( &m_matrix, &m_matrix, (cairo_matrix_t*) t->GetNativeMatrix());           
+    cairo_matrix_multiply( &m_matrix, &m_matrix, (cairo_matrix_t*) t->GetNativeMatrix());

 }
 
 // sets the matrix to the respective values
 }
 
 // sets the matrix to the respective values

-void wxCairoMatrixData::Set(wxDouble a, wxDouble b, wxDouble c, wxDouble d, 
-                        wxDouble tx, wxDouble ty) 
+void wxCairoMatrixData::Set(wxDouble a, wxDouble b, wxDouble c, wxDouble d,
+                        wxDouble tx, wxDouble ty)

 {
     cairo_matrix_init( &m_matrix, a, b, c, d, tx, ty);
 }
 {
     cairo_matrix_init( &m_matrix, a, b, c, d, tx, ty);
 }


@@ -933,21 +942,21 @@ void wxCairoMatrixData::Get(wxDouble* a, wxDouble* b,  wxDouble* c,
 }
 
 // makes this the inverse matrix
 }
 
 // makes this the inverse matrix

-void wxCairoMatrixData::Invert() 
+void wxCairoMatrixData::Invert()

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

-bool wxCairoMatrixData::IsEqual( const wxGraphicsMatrixData* t) const  
+bool wxCairoMatrixData::IsEqual( const wxGraphicsMatrixData* t) const

 {
     const cairo_matrix_t* tm = (cairo_matrix_t*) t->GetNativeMatrix();
 {
     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 && 
+    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 ) ;
 }
 
         m_matrix.y0 == tm->y0 ) ;
 }
 


@@ -975,10 +984,10 @@ void wxCairoMatrixData::Scale( wxDouble xScale , wxDouble yScale )
 }
 
 // add the rotation to this matrix (radians)
 }
 
 // add the rotation to this matrix (radians)

-void wxCairoMatrixData::Rotate( wxDouble angle ) 
+void wxCairoMatrixData::Rotate( wxDouble angle )

 {
     cairo_matrix_rotate( &m_matrix, angle) ;
 {
     cairo_matrix_rotate( &m_matrix, angle) ;

-}      
+}

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


@@ -1032,17 +1041,49 @@ public :
     bool m_offset;
 } ;
 
     bool m_offset;
 } ;
 

+wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxPrinterDC& dc )
+: wxGraphicsContext(renderer)
+{
+#ifdef __WXGTK20__
+    const wxDCImpl *impl = dc.GetImpl();
+    Init( (cairo_t*) impl->GetCairoContext() );
+
+    wxPoint org = dc.GetDeviceOrigin();
+    cairo_translate( m_context, org.x, org.y );
+
+    double sx,sy;
+    dc.GetUserScale( &sx, &sy );
+    cairo_scale( m_context, sx, sy );
+
+    org = dc.GetLogicalOrigin();
+    cairo_translate( m_context, -org.x, -org.y );
+#endif
+}
+

 wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxWindowDC& dc )
 : wxGraphicsContext(renderer)
 {
 wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxWindowDC& dc )
 : wxGraphicsContext(renderer)
 {

-#ifdef __WXGTK__
-#if wxUSE_NEW_DC
-    wxGTKImplDC *impldc = (wxGTKImplDC*) dc.GetImpl();
+#ifdef __WXGTK20__
+    wxGTKDCImpl *impldc = (wxGTKDCImpl*) dc.GetImpl();

     Init( gdk_cairo_create( impldc->GetGDKWindow() ) );
     Init( gdk_cairo_create( impldc->GetGDKWindow() ) );

-#else  
-    Init( gdk_cairo_create( dc.m_window ) );
+
+#if 0
+    wxGraphicsMatrix matrix = CreateMatrix();
+
+    wxPoint org = dc.GetDeviceOrigin();
+    matrix.Translate( org.x, org.y );
+
+    org = dc.GetLogicalOrigin();
+    matrix.Translate( -org.x, -org.y );
+
+    double sx,sy;
+    dc.GetUserScale( &sx, &sy );
+    matrix.Scale( sx, sy );
+
+    ConcatTransform( matrix );

 #endif
 #endif
 #endif
 #endif

+

 #ifdef __WXMAC__
     int width, height;
     dc.GetSize( &width, &height );
 #ifdef __WXMAC__
     int width, height;
     dc.GetSize( &width, &height );


@@ -1053,7 +1094,41 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxWindowDC&
 #endif
 }
 
 #endif
 }
 

-#ifdef __WXGTK__
+wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxMemoryDC& dc )
+: wxGraphicsContext(renderer)
+{
+#ifdef __WXGTK20__
+    wxGTKDCImpl *impldc = (wxGTKDCImpl*) dc.GetImpl();
+    Init( gdk_cairo_create( impldc->GetGDKWindow() ) );
+
+#if 0
+    wxGraphicsMatrix matrix = CreateMatrix();
+
+    wxPoint org = dc.GetDeviceOrigin();
+    matrix.Translate( org.x, org.y );
+
+    org = dc.GetLogicalOrigin();
+    matrix.Translate( -org.x, -org.y );
+
+    double sx,sy;
+    dc.GetUserScale( &sx, &sy );
+    matrix.Scale( sx, sy );
+
+    ConcatTransform( matrix );
+#endif
+#endif
+
+#ifdef __WXMAC__
+    int width, height;
+    dc.GetSize( &width, &height );
+    CGContextRef cgcontext = (CGContextRef)dc.GetWindow()->MacGetCGContextRef();
+    cairo_surface_t* surface = cairo_quartz_surface_create_for_cg_context(cgcontext, width, height);
+    Init( cairo_create( surface ) );
+    cairo_surface_destroy( surface );
+#endif
+}
+
+#ifdef __WXGTK20__

 wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, GdkDrawable *drawable )
 : wxGraphicsContext(renderer)
 {
 wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, GdkDrawable *drawable )
 : wxGraphicsContext(renderer)
 {


@@ -1115,14 +1190,14 @@ void wxCairoContext::Clip( const wxRegion& region )
         path.AddRectangle(ri.GetX(), ri.GetY(), ri.GetW(), ri.GetH());
         ++ri;
     }
         path.AddRectangle(ri.GetX(), ri.GetY(), ri.GetW(), ri.GetH());
         ++ri;
     }

-    
+

     // Put it in the context
     cairo_path_t* cp = (cairo_path_t*) path.GetNativePath() ;
     cairo_append_path(m_context, cp);
 
     // clip to that path
     cairo_clip(m_context);
     // Put it in the context
     cairo_path_t* cp = (cairo_path_t*) path.GetNativePath() ;
     cairo_append_path(m_context, cp);
 
     // clip to that path
     cairo_clip(m_context);

-    path.UnGetNativePath(cp);  
+    path.UnGetNativePath(cp);

 }
 
 void wxCairoContext::Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h )
 }
 
 void wxCairoContext::Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h )


@@ -1137,7 +1212,7 @@ void wxCairoContext::Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h )
 
     // clip to that path
     cairo_clip(m_context);
 
     // clip to that path
     cairo_clip(m_context);

-    path.UnGetNativePath(cp);  
+    path.UnGetNativePath(cp);

 }
 
 void wxCairoContext::ResetClip()
 }
 
 void wxCairoContext::ResetClip()


@@ -1149,8 +1224,8 @@ void wxCairoContext::ResetClip()
 void wxCairoContext::StrokePath( const wxGraphicsPath& path )
 {
     if ( !m_pen.IsNull() )
 void wxCairoContext::StrokePath( const wxGraphicsPath& path )
 {
     if ( !m_pen.IsNull() )

-    {   
-        wxCairoOffsetHelper helper( m_context, ShouldOffset() ) ;       
+    {
+        wxCairoOffsetHelper helper( m_context, ShouldOffset() ) ;

         cairo_path_t* cp = (cairo_path_t*) path.GetNativePath() ;
         cairo_append_path(m_context,cp);
         ((wxCairoPenData*)m_pen.GetRefData())->Apply(this);
         cairo_path_t* cp = (cairo_path_t*) path.GetNativePath() ;
         cairo_append_path(m_context,cp);
         ((wxCairoPenData*)m_pen.GetRefData())->Apply(this);


@@ -1159,7 +1234,7 @@ void wxCairoContext::StrokePath( const wxGraphicsPath& path )
     }
 }
 
     }
 }
 

-void wxCairoContext::FillPath( const wxGraphicsPath& path , int fillStyle )
+void wxCairoContext::FillPath( const wxGraphicsPath& path , wxPolygonFillMode fillStyle )

 {
     if ( !m_brush.IsNull() )
     {
 {
     if ( !m_brush.IsNull() )
     {


@@ -1230,7 +1305,7 @@ void wxCairoContext::DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wx
     wxBitmap bmpSource = bmp;  // we need a non-const instance
     unsigned char* buffer = new unsigned char[bw*bh*4];
     wxUint32* data = (wxUint32*)buffer;
     wxBitmap bmpSource = bmp;  // we need a non-const instance
     unsigned char* buffer = new unsigned char[bw*bh*4];
     wxUint32* data = (wxUint32*)buffer;

-    
+

     // Create a surface object and copy the bitmap pixel data to it.  if the
     // image has alpha (or a mask represented as alpha) then we'll use a
     // different format and iterator than if it doesn't...
     // Create a surface object and copy the bitmap pixel data to it.  if the
     // image has alpha (or a mask represented as alpha) then we'll use a
     // different format and iterator than if it doesn't...


@@ -1240,7 +1315,7 @@ void wxCairoContext::DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wx
             buffer, CAIRO_FORMAT_ARGB32, bw, bh, bw*4);
         wxAlphaPixelData pixData(bmpSource, wxPoint(0,0), wxSize(bw, bh));
         wxCHECK_RET( pixData, wxT("Failed to gain raw access to bitmap data."));
             buffer, CAIRO_FORMAT_ARGB32, bw, bh, bw*4);
         wxAlphaPixelData pixData(bmpSource, wxPoint(0,0), wxSize(bw, bh));
         wxCHECK_RET( pixData, wxT("Failed to gain raw access to bitmap data."));

-        
+

         wxAlphaPixelData::Iterator p(pixData);
         for (int y=0; y<bh; y++)
         {
         wxAlphaPixelData::Iterator p(pixData);
         for (int y=0; y<bh; y++)
         {


@@ -1255,16 +1330,16 @@ void wxCairoContext::DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wx
                 if (alpha == 0)
                     *data = 0;
                 else
                 if (alpha == 0)
                     *data = 0;
                 else

-                    *data = ( alpha                      << 24 
-                              | (p.Red() * alpha/255)    << 16 
-                              | (p.Green() * alpha/255)  <<  8 
+                    *data = ( alpha                      << 24
+                              | (p.Red() * alpha/255)    << 16
+                              | (p.Green() * alpha/255)  <<  8

                               | (p.Blue() * alpha/255) );
                 ++data;
                 ++p;
             }
             p = rowStart;
             p.OffsetY(pixData, 1);
                               | (p.Blue() * alpha/255) );
                 ++data;
                 ++p;
             }
             p = rowStart;
             p.OffsetY(pixData, 1);

-        }        
+        }

     }
     else  // no alpha
     {
     }
     else  // no alpha
     {


@@ -1272,7 +1347,7 @@ void wxCairoContext::DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wx
             buffer, CAIRO_FORMAT_RGB24, bw, bh, bw*4);
         wxNativePixelData pixData(bmpSource, wxPoint(0,0), wxSize(bw, bh));
         wxCHECK_RET( pixData, wxT("Failed to gain raw access to bitmap data."));
             buffer, CAIRO_FORMAT_RGB24, bw, bh, bw*4);
         wxNativePixelData pixData(bmpSource, wxPoint(0,0), wxSize(bw, bh));
         wxCHECK_RET( pixData, wxT("Failed to gain raw access to bitmap data."));

-        
+

         wxNativePixelData::Iterator p(pixData);
         for (int y=0; y<bh; y++)
         {
         wxNativePixelData::Iterator p(pixData);
         for (int y=0; y<bh; y++)
         {


@@ -1289,12 +1364,12 @@ void wxCairoContext::DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wx
             }
             p = rowStart;
             p.OffsetY(pixData, 1);
             }
             p = rowStart;
             p.OffsetY(pixData, 1);

-        }        
+        }

     }
 
     }
 

-    
+

     PushState();
     PushState();

-    
+

     // In case we're scaling the image by using a width and height different
     // than the bitmap's size create a pattern transformation on the surface and
     // draw the transformed pattern.
     // In case we're scaling the image by using a width and height different
     // than the bitmap's size create a pattern transformation on the surface and
     // draw the transformed pattern.


@@ -1327,41 +1402,57 @@ void wxCairoContext::DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDou
 }
 
 
 }
 
 

-void wxCairoContext::DrawText( const wxString &str, wxDouble x, wxDouble y )
+void wxCairoContext::DoDrawText(const wxString& str, wxDouble x, wxDouble y)

 {
 {

-    if ( m_font.IsNull() || str.empty())
+    wxCHECK_RET( !m_font.IsNull(),
+                 wxT("wxCairoContext::DrawText - no valid font set") );
+
+    if ( str.empty())

         return;
 
         return;
 

-#ifdef __WXGTK__

     const wxCharBuffer data = str.utf8_str();
     if ( !data )
         return;
     const wxCharBuffer data = str.utf8_str();
     if ( !data )
         return;

-    size_t datalen = strlen(data);
+

     ((wxCairoFontData*)m_font.GetRefData())->Apply(this);
 
     ((wxCairoFontData*)m_font.GetRefData())->Apply(this);
 

+#ifdef __WXGTK__
+    size_t datalen = strlen(data);
+

     PangoLayout *layout = pango_cairo_create_layout (m_context);
     PangoLayout *layout = pango_cairo_create_layout (m_context);

-    pango_layout_set_font_description( layout, ((wxCairoFontData*)m_font.GetRefData())->GetFont());
+    wxCairoFontData* font_data = (wxCairoFontData*) m_font.GetRefData();
+    pango_layout_set_font_description( layout, font_data->GetFont());

     pango_layout_set_text(layout, data, datalen);
     pango_layout_set_text(layout, data, datalen);

+    
+    if (font_data->GetUnderlined()) 
+    {
+        PangoAttrList *attrs = pango_attr_list_new();
+        PangoAttribute *attr = pango_attr_underline_new(PANGO_UNDERLINE_SINGLE);
+        pango_attr_list_insert(attrs, attr);
+        pango_layout_set_attributes(layout, attrs);
+        pango_attr_list_unref(attrs);
+    }
+

     cairo_move_to(m_context, x, y);
     pango_cairo_show_layout (m_context, layout);
 
     g_object_unref (layout);
 #else
     cairo_move_to(m_context, x, y);
     pango_cairo_show_layout (m_context, layout);
 
     g_object_unref (layout);
 #else

-    ((wxCairoFontData*)m_font.GetRefData())->Apply(this);

     // Cairo's x,y for drawing text is at the baseline, so we need to adjust
     // the position we move to by the ascent.
     cairo_font_extents_t fe;
     cairo_font_extents(m_context, &fe);
     cairo_move_to(m_context, x, y+fe.ascent);
     // Cairo's x,y for drawing text is at the baseline, so we need to adjust
     // the position we move to by the ascent.
     cairo_font_extents_t fe;
     cairo_font_extents(m_context, &fe);
     cairo_move_to(m_context, x, y+fe.ascent);

-    
-    const wxWX2MBbuf buf(str.mb_str(wxConvUTF8));
-    cairo_show_text(m_context,buf);
+
+    cairo_show_text(m_context, data);

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

+    wxCHECK_RET( !m_font.IsNull(), wxT("wxCairoContext::GetTextExtent - no valid font set") );
+

     if ( width )
         *width = 0;
     if ( height )
     if ( width )
         *width = 0;
     if ( height )


@@ -1371,12 +1462,12 @@ void wxCairoContext::GetTextExtent( const wxString &str, wxDouble *width, wxDoub
     if ( externalLeading )
         *externalLeading = 0;
 
     if ( externalLeading )
         *externalLeading = 0;
 

-    if ( m_font.IsNull() || str.empty())
+    if ( str.empty())

         return;
 
 #ifdef __WXGTK__
     int w, h;
         return;
 
 #ifdef __WXGTK__
     int w, h;

-  
+

     PangoLayout *layout = pango_cairo_create_layout (m_context);
     pango_layout_set_font_description( layout, ((wxCairoFontData*)m_font.GetRefData())->GetFont());
     const wxCharBuffer data = str.utf8_str();
     PangoLayout *layout = pango_cairo_create_layout (m_context);
     pango_layout_set_font_description( layout, ((wxCairoFontData*)m_font.GetRefData())->GetFont());
     const wxCharBuffer data = str.utf8_str();


@@ -1413,18 +1504,18 @@ void wxCairoContext::GetTextExtent( const wxString &str, wxDouble *width, wxDoub
     {
         cairo_font_extents_t fe;
         cairo_font_extents(m_context, &fe);
     {
         cairo_font_extents_t fe;
         cairo_font_extents(m_context, &fe);

-        
+

         // some backends have negative descents
         // some backends have negative descents

-        
+

         if ( fe.descent < 0 )
             fe.descent = -fe.descent;
         if ( fe.descent < 0 )
             fe.descent = -fe.descent;

-    
+

         if ( fe.height < (fe.ascent + fe.descent ) )
         {
             // some backends are broken re height ... (eg currently ATSUI)
             fe.height = fe.ascent + fe.descent;
         }
         if ( fe.height < (fe.ascent + fe.descent ) )
         {
             // some backends are broken re height ... (eg currently ATSUI)
             fe.height = fe.ascent + fe.descent;
         }

-    
+

         if (height)
             *height = fe.height;
         if ( descent )
         if (height)
             *height = fe.height;
         if ( descent )


@@ -1440,17 +1531,111 @@ void wxCairoContext::GetPartialTextExtents(const wxString& text, wxArrayDouble&
     widths.Empty();
     widths.Add(0, text.length());
 
     widths.Empty();
     widths.Add(0, text.length());
 

+    wxCHECK_RET( !m_font.IsNull(), wxT("wxCairoContext::GetPartialTextExtents - no valid font set") );
+

     if (text.empty())
         return;
 
     // TODO
 }
 
     if (text.empty())
         return;
 
     // TODO
 }
 

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

 {
     return m_context;
 }
 
 {
     return m_context;
 }
 

+bool wxCairoContext::SetAntialiasMode(wxAntialiasMode antialias)
+{
+    if (m_antialias == antialias)
+        return true;
+
+    m_antialias = antialias;
+    
+    cairo_antialias_t antialiasMode;
+    switch (antialias)
+    {
+        case wxANTIALIAS_DEFAULT:
+            antialiasMode = CAIRO_ANTIALIAS_DEFAULT;
+            break;
+        case wxANTIALIAS_NONE:
+            antialiasMode = CAIRO_ANTIALIAS_NONE;
+            break;
+        default:
+            return false;
+    }
+    cairo_set_antialias(m_context, antialiasMode);
+    return true;
+}
+
+bool wxCairoContext::SetCompositionMode(wxCompositionMode op)
+{
+    if ( m_composition == op )
+        return true;
+        
+    m_composition = op;
+    cairo_operator_t cop;
+    switch (op)
+    {
+        case wxCOMPOSITION__CLEAR:
+            cop = CAIRO_OPERATOR_CLEAR;
+            break;
+        case wxCOMPOSITION_SOURCE:
+            cop = CAIRO_OPERATOR_SOURCE;
+            break;
+        case wxCOMPOSITION_OVER:
+            cop = CAIRO_OPERATOR_OVER;
+            break;
+        case wxCOMPOSITION_IN:
+            cop = CAIRO_OPERATOR_IN;
+            break;
+        case wxCOMPOSITION_OUT:
+            cop = CAIRO_OPERATOR_OUT;
+            break;
+        case wxCOMPOSITION_ATOP:
+            cop = CAIRO_OPERATOR_ATOP;
+            break;
+        case wxCOMPOSITION_DEST:
+            cop = CAIRO_OPERATOR_DEST;
+            break;
+        case wxCOMPOSITION_DEST_OVER:
+            cop = CAIRO_OPERATOR_DEST_OVER;
+            break;
+        case wxCOMPOSITION_DEST_IN:
+            cop = CAIRO_OPERATOR_DEST_IN;
+            break;
+        case wxCOMPOSITION_DEST_OUT:
+            cop = CAIRO_OPERATOR_DEST_OUT;
+            break;
+        case wxCOMPOSITION_DEST_ATOP:
+            cop = CAIRO_OPERATOR_DEST_ATOP;
+            break;
+        case wxCOMPOSITION_XOR:
+            cop = CAIRO_OPERATOR_XOR;
+            break;
+        case wxCOMPOSITION_ADD:
+            cop = CAIRO_OPERATOR_ADD;
+            break;
+        default:
+            return false;
+    }
+    cairo_set_operator(m_context, cop);
+    return true;
+}
+
+void wxCairoContext::BeginLayer(wxDouble opacity)
+{
+    m_layerOpacities.push_back(opacity);
+    cairo_push_group(m_context);
+}
+
+void wxCairoContext::EndLayer()
+{
+    float opacity = m_layerOpacities.back();
+    m_layerOpacities.pop_back();
+    cairo_pop_group_to_source(m_context);
+    cairo_paint_with_alpha(m_context,opacity);
+}
+    

 //-----------------------------------------------------------------------------
 // wxCairoRenderer declaration
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxCairoRenderer declaration
 //-----------------------------------------------------------------------------


@@ -1465,10 +1650,8 @@ public :
     // Context
 
     virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc);
     // Context
 
     virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc);

-
-#ifdef __WXMSW__

     virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc);
     virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc);

-#endif
+    virtual wxGraphicsContext * CreateContext( const wxPrinterDC& dc);

 
     virtual wxGraphicsContext * CreateContextFromNativeContext( void * context );
 
 
     virtual wxGraphicsContext * CreateContextFromNativeContext( void * context );
 


@@ -1484,7 +1667,7 @@ public :
 
     // Matrix
 
 
     // Matrix
 

-    virtual wxGraphicsMatrix CreateMatrix( wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0, 
+    virtual wxGraphicsMatrix CreateMatrix( wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0,

         wxDouble tx=0.0, wxDouble ty=0.0);
 
 
         wxDouble tx=0.0, wxDouble ty=0.0);
 
 


@@ -1493,10 +1676,10 @@ public :
     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 CreateBrush(const wxBrush& brush ) ;
 
     // sets the brush to a linear gradient, starting at (x1,y1) with color c1 to (x2,y2) with color c2

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

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

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

     // with radius r and color cColor
     virtual wxGraphicsBrush CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
         const wxColour &oColor, const wxColour &cColor) ;
     // 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) ;


@@ -1504,6 +1687,20 @@ public :
     // sets the font
     virtual wxGraphicsFont CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) ;
 
     // sets the font
     virtual wxGraphicsFont CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) ;
 

+    // create a native bitmap representation
+#if 0
+    virtual wxGraphicsBitmap CreateBitmap( const wxBitmap &bitmap )
+    {
+      return wxGraphicsBitmap;
+    }
+
+    // create a subimage from a native image representation
+    virtual wxGraphicsBitmap CreateSubBitmap( const wxGraphicsBitmap &bitmap, wxDouble x, wxDouble y, wxDouble w, wxDouble h  )
+    {
+      return wxGraphicsBitmap;
+    }
+#endif
+

 private :
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxCairoRenderer)
 } ;
 private :
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxCairoRenderer)
 } ;


@@ -1531,12 +1728,22 @@ wxGraphicsContext * wxCairoRenderer::CreateContext( const wxWindowDC& dc)
     return new wxCairoContext(this,dc);
 }
 
     return new wxCairoContext(this,dc);
 }
 

-#ifdef __WXMSW__

 wxGraphicsContext * wxCairoRenderer::CreateContext( const wxMemoryDC& dc)
 {
 wxGraphicsContext * wxCairoRenderer::CreateContext( const wxMemoryDC& dc)
 {

-    return NULL;
+    return new wxCairoContext(this,dc);

 }
 }

+
+wxGraphicsContext * wxCairoRenderer::CreateContext( const wxPrinterDC& dc)
+{
+#ifdef __WXGTK20__
+    const wxDCImpl *impl = dc.GetImpl();
+    cairo_t* context = (cairo_t*) impl->GetCairoContext();
+    if (context)
+       return new wxCairoContext(this,dc);
+    else

 #endif
 #endif

+       return NULL;
+}

 
 wxGraphicsContext * wxCairoRenderer::CreateContextFromNativeContext( void * context )
 {
 
 wxGraphicsContext * wxCairoRenderer::CreateContextFromNativeContext( void * context )
 {


@@ -1576,7 +1783,7 @@ wxGraphicsPath wxCairoRenderer::CreatePath()
 
 // Matrix
 
 
 // Matrix
 

-wxGraphicsMatrix wxCairoRenderer::CreateMatrix( wxDouble a, wxDouble b, wxDouble c, wxDouble d, 
+wxGraphicsMatrix wxCairoRenderer::CreateMatrix( wxDouble a, wxDouble b, wxDouble c, wxDouble d,

                                                 wxDouble tx, wxDouble ty)
 
 {
                                                 wxDouble tx, wxDouble ty)
 
 {


@@ -1587,7 +1794,7 @@ wxGraphicsMatrix wxCairoRenderer::CreateMatrix( wxDouble a, wxDouble b, wxDouble
     return m;
 }
 
     return m;
 }
 

-wxGraphicsPen wxCairoRenderer::CreatePen(const wxPen& pen) 
+wxGraphicsPen wxCairoRenderer::CreatePen(const wxPen& pen)

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


@@ -1599,7 +1806,7 @@ wxGraphicsPen wxCairoRenderer::CreatePen(const wxPen& pen)
     }
 }
 
     }
 }
 

-wxGraphicsBrush wxCairoRenderer::CreateBrush(const wxBrush& brush ) 
+wxGraphicsBrush wxCairoRenderer::CreateBrush(const wxBrush& brush )

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


@@ -1612,8 +1819,8 @@ wxGraphicsBrush wxCairoRenderer::CreateBrush(const wxBrush& brush )
 }
 
 // sets the brush to a linear gradient, starting at (x1,y1) with color c1 to (x2,y2) with color c2
 }
 
 // sets the brush to a linear gradient, starting at (x1,y1) with color c1 to (x2,y2) with color c2

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

 {
     wxGraphicsBrush p;
     wxCairoBrushData* d = new wxCairoBrushData( this );
 {
     wxGraphicsBrush p;
     wxCairoBrushData* d = new wxCairoBrushData( this );


@@ -1622,10 +1829,10 @@ wxGraphicsBrush wxCairoRenderer::CreateLinearGradientBrush( wxDouble x1, wxDoubl
     return p;
 }
 
     return p;
 }
 

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

 // with radius r and color cColor
 wxGraphicsBrush wxCairoRenderer::CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
 // 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) 
+                                                                      const wxColour &oColor, const wxColour &cColor)

 {
     wxGraphicsBrush p;
     wxCairoBrushData* d = new wxCairoBrushData( this );
 {
     wxGraphicsBrush p;
     wxCairoBrushData* d = new wxCairoBrushData( this );


@@ -1635,10 +1842,10 @@ wxGraphicsBrush wxCairoRenderer::CreateRadialGradientBrush( wxDouble xo, wxDoubl
 }
 
 // sets the font
 }
 
 // sets the font

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

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

-    {        
+    {

         wxGraphicsFont p;
         p.SetRefData(new wxCairoFontData( this , font, col ));
         return p;
         wxGraphicsFont p;
         p.SetRefData(new wxCairoFontData( this , font, col ));
         return p;