#9675: wxDataViewModel::Reset() and scrollbar problem (wxMac)

[wxWidgets.git] / src / common / graphcmn.cpp

diff --git a/src/common/graphcmn.cpp b/src/common/graphcmn.cpp
index 36a3d228dbe5af4b7fddfd4cf70c95da8d509dad..d3166c26ddfa9b759c23855a280b50e1afe263e4 100644 (file)
--- a/src/common/graphcmn.cpp
+++ b/src/common/graphcmn.cpp
@@ -18,17 +18,14 @@
 
 #if wxUSE_GRAPHICS_CONTEXT
 
 
 #if wxUSE_GRAPHICS_CONTEXT
 

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

 
 #ifndef WX_PRECOMP
     #include "wx/icon.h"
     #include "wx/bitmap.h"
     #include "wx/dcmemory.h"
     #include "wx/region.h"
 
 #ifndef WX_PRECOMP
     #include "wx/icon.h"
     #include "wx/bitmap.h"
     #include "wx/dcmemory.h"
     #include "wx/region.h"

-#endif
-
-#if !defined(wxMAC_USE_CORE_GRAPHICS_BLEND_MODES)
-#define wxMAC_USE_CORE_GRAPHICS_BLEND_MODES 0
+    #include "wx/log.h"

 #endif
 
 //-----------------------------------------------------------------------------
 #endif
 
 //-----------------------------------------------------------------------------


@@ -48,24 +45,188 @@ static inline double DegToRad(double deg)
 
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 

+//-----------------------------------------------------------------------------
+// wxGraphicsObject
+//-----------------------------------------------------------------------------
+

 IMPLEMENT_DYNAMIC_CLASS(wxGraphicsObject, wxObject)
 
 IMPLEMENT_DYNAMIC_CLASS(wxGraphicsObject, wxObject)
 

-IMPLEMENT_ABSTRACT_CLASS(wxGraphicsRenderer, wxObject)
+wxGraphicsObjectRefData::wxGraphicsObjectRefData( wxGraphicsRenderer* renderer )
+{
+    m_renderer = renderer;
+}
+wxGraphicsObjectRefData::wxGraphicsObjectRefData( const wxGraphicsObjectRefData* data )
+{
+    m_renderer = data->m_renderer;
+}
+wxGraphicsRenderer* wxGraphicsObjectRefData::GetRenderer() const 
+{ 
+    return m_renderer ; 
+}
+
+wxGraphicsObjectRefData* wxGraphicsObjectRefData::Clone() const 
+{
+    return new wxGraphicsObjectRefData(this);
+}
+
+wxGraphicsObject::wxGraphicsObject() 
+{
+}
+
+wxGraphicsObject::wxGraphicsObject( wxGraphicsRenderer* renderer ) 
+{
+    SetRefData( new wxGraphicsObjectRefData(renderer));
+}
+
+wxGraphicsObject::~wxGraphicsObject() 
+{
+}
+
+bool wxGraphicsObject::IsNull() const 
+{ 
+    return m_refData == NULL; 
+}
+
+wxGraphicsRenderer* wxGraphicsObject::GetRenderer() const 
+{ 
+    return ( IsNull() ? NULL : GetGraphicsData()->GetRenderer() ); 
+}
+
+wxGraphicsObjectRefData* wxGraphicsObject::GetGraphicsData() const 
+{ 
+    return (wxGraphicsObjectRefData*) m_refData; 
+}
+
+wxObjectRefData* wxGraphicsObject::CreateRefData() const
+{
+    wxLogDebug(wxT("A Null Object cannot be changed"));
+    return NULL;
+}
+
+wxObjectRefData* wxGraphicsObject::CloneRefData(const wxObjectRefData* data) const
+{
+    const wxGraphicsObjectRefData* ptr = (const wxGraphicsObjectRefData*) data;
+    return ptr->Clone();
+}
+
+//-----------------------------------------------------------------------------
+// pens etc.
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxGraphicsPen, wxGraphicsObject)
+IMPLEMENT_DYNAMIC_CLASS(wxGraphicsBrush, wxGraphicsObject)
+IMPLEMENT_DYNAMIC_CLASS(wxGraphicsFont, wxGraphicsObject)
+IMPLEMENT_DYNAMIC_CLASS(wxGraphicsBitmap, wxGraphicsObject)
+
+WXDLLIMPEXP_DATA_CORE(wxGraphicsPen) wxNullGraphicsPen;
+WXDLLIMPEXP_DATA_CORE(wxGraphicsBrush) wxNullGraphicsBrush;
+WXDLLIMPEXP_DATA_CORE(wxGraphicsFont) wxNullGraphicsFont;
+WXDLLIMPEXP_DATA_CORE(wxGraphicsBitmap) wxNullGraphicsBitmap;
+
+//-----------------------------------------------------------------------------
+// matrix
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxGraphicsMatrix, wxGraphicsObject)
+WXDLLIMPEXP_DATA_CORE(wxGraphicsMatrix) wxNullGraphicsMatrix;
+
+// concatenates the matrix
+void wxGraphicsMatrix::Concat( const wxGraphicsMatrix *t )
+{
+    AllocExclusive();
+    GetMatrixData()->Concat(t->GetMatrixData());
+}
+
+// sets the matrix to the respective values
+void wxGraphicsMatrix::Set(wxDouble a, wxDouble b, wxDouble c, wxDouble d, 
+                           wxDouble tx, wxDouble ty)
+{
+    AllocExclusive();
+    GetMatrixData()->Set(a,b,c,d,tx,ty);
+}
+
+// gets the component valuess of the matrix
+void wxGraphicsMatrix::Get(wxDouble* a, wxDouble* b,  wxDouble* c,
+                           wxDouble* d, wxDouble* tx, wxDouble* ty) const
+{
+    GetMatrixData()->Get(a, b, c, d, tx, ty);
+}
+
+// makes this the inverse matrix
+void wxGraphicsMatrix::Invert()
+{
+    AllocExclusive();
+    GetMatrixData()->Invert();
+}
+
+// returns true if the elements of the transformation matrix are equal ?
+bool wxGraphicsMatrix::IsEqual( const wxGraphicsMatrix* t) const
+{
+    return GetMatrixData()->IsEqual(t->GetMatrixData());
+}
+
+// return true if this is the identity matrix
+bool wxGraphicsMatrix::IsIdentity() const
+{
+    return GetMatrixData()->IsIdentity();
+}
+
+// add the translation to this matrix
+void wxGraphicsMatrix::Translate( wxDouble dx , wxDouble dy )
+{
+    AllocExclusive();
+    GetMatrixData()->Translate(dx,dy);
+}
+
+// add the scale to this matrix
+void wxGraphicsMatrix::Scale( wxDouble xScale , wxDouble yScale )
+{
+    AllocExclusive();
+    GetMatrixData()->Scale(xScale,yScale);
+}
+
+// add the rotation to this matrix (radians)
+void wxGraphicsMatrix::Rotate( wxDouble angle )
+{
+    AllocExclusive();
+    GetMatrixData()->Rotate(angle);
+}  
+
+//
+// apply the transforms
+//
+
+// applies that matrix to the point
+void wxGraphicsMatrix::TransformPoint( wxDouble *x, wxDouble *y ) const
+{
+    GetMatrixData()->TransformPoint(x,y);
+}

 
 

-IMPLEMENT_ABSTRACT_CLASS(wxGraphicsMatrix, wxGraphicsObject)
+// applies the matrix except for translations
+void wxGraphicsMatrix::TransformDistance( wxDouble *dx, wxDouble *dy ) const
+{
+    GetMatrixData()->TransformDistance(dx,dy);
+}

 
 

-IMPLEMENT_ABSTRACT_CLASS(wxGraphicsPath, wxGraphicsObject)
+// returns the native representation
+void * wxGraphicsMatrix::GetNativeMatrix() const
+{
+    return GetMatrixData()->GetNativeMatrix();
+}

 
 

-IMPLEMENT_ABSTRACT_CLASS(wxGraphicsPen, wxGraphicsObject)
+//-----------------------------------------------------------------------------
+// path
+//-----------------------------------------------------------------------------

 
 

-IMPLEMENT_ABSTRACT_CLASS(wxGraphicsBrush, wxGraphicsObject)
+IMPLEMENT_DYNAMIC_CLASS(wxGraphicsPath, wxGraphicsObject)
+WXDLLIMPEXP_DATA_CORE(wxGraphicsPath) wxNullGraphicsPath;

 
 

-IMPLEMENT_ABSTRACT_CLASS(wxGraphicsFont, wxGraphicsObject)
+// convenience functions, for using wxPoint2DDouble etc

 
 

-wxPoint2DDouble wxGraphicsPath::GetCurrentPoint()
+wxPoint2DDouble wxGraphicsPath::GetCurrentPoint() const

 {
     wxDouble x,y;
 {
     wxDouble x,y;

-    GetCurrentPoint(x,y);
+    GetCurrentPoint(&x,&y);

     return wxPoint2DDouble(x,y);
 }
 
     return wxPoint2DDouble(x,y);
 }
 


@@ -89,24 +250,156 @@ void wxGraphicsPath::AddArc( const wxPoint2DDouble& c, wxDouble r, wxDouble star
     AddArc(c.m_x, c.m_y, r, startAngle, endAngle, clockwise);
 }
 
     AddArc(c.m_x, c.m_y, r, startAngle, endAngle, clockwise);
 }
 

-wxRect2DDouble wxGraphicsPath::GetBox()
+wxRect2DDouble wxGraphicsPath::GetBox() const

 {
        wxDouble x,y,w,h;
        GetBox(&x,&y,&w,&h);
        return wxRect2DDouble( x,y,w,h );
 }
 
 {
        wxDouble x,y,w,h;
        GetBox(&x,&y,&w,&h);
        return wxRect2DDouble( x,y,w,h );
 }
 

+bool wxGraphicsPath::Contains( const wxPoint2DDouble& c, int fillStyle ) const
+{
+    return Contains( c.m_x, c.m_y, fillStyle);
+}
+
+// true redirections
+
+// begins a new subpath at (x,y)
+void wxGraphicsPath::MoveToPoint( wxDouble x, wxDouble y )
+{
+    AllocExclusive();
+    GetPathData()->MoveToPoint(x,y);
+}
+
+// adds a straight line from the current point to (x,y) 
+void wxGraphicsPath::AddLineToPoint( wxDouble x, wxDouble y )
+{
+    AllocExclusive();
+    GetPathData()->AddLineToPoint(x,y);
+}
+
+// adds a cubic Bezier curve from the current point, using two control points and an end point
+void wxGraphicsPath::AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y )
+{
+    AllocExclusive();
+    GetPathData()->AddCurveToPoint(cx1,cy1,cx2,cy2,x,y);
+}
+
+// adds another path
+void wxGraphicsPath::AddPath( const wxGraphicsPath& path )
+{
+    AllocExclusive();
+    GetPathData()->AddPath(path.GetPathData());
+}
+
+// closes the current sub-path
+void wxGraphicsPath::CloseSubpath()
+{
+    AllocExclusive();
+    GetPathData()->CloseSubpath();
+}
+
+// gets the last point of the current path, (0,0) if not yet set
+void wxGraphicsPath::GetCurrentPoint( wxDouble* x, wxDouble* y) const
+{
+    GetPathData()->GetCurrentPoint(x,y);
+}
+
+// adds an arc of a circle centering at (x,y) with radius (r) from startAngle to endAngle
+void wxGraphicsPath::AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise )
+{
+    AllocExclusive();
+    GetPathData()->AddArc(x,y,r,startAngle,endAngle,clockwise);
+}
+

 //
 //

-// Emulations
+// These are convenience functions which - if not available natively will be assembled 
+// using the primitives from above

 //
 
 //
 

+// adds a quadratic Bezier curve from the current point, using a control point and an end point

 void wxGraphicsPath::AddQuadCurveToPoint( wxDouble cx, wxDouble cy, wxDouble x, wxDouble y )
 void wxGraphicsPath::AddQuadCurveToPoint( wxDouble cx, wxDouble cy, wxDouble x, wxDouble y )

+{
+    AllocExclusive();
+    GetPathData()->AddQuadCurveToPoint(cx,cy,x,y);
+}
+
+// appends a rectangle as a new closed subpath 
+void wxGraphicsPath::AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h )
+{
+    AllocExclusive();
+    GetPathData()->AddRectangle(x,y,w,h);
+}
+
+// appends an ellipsis as a new closed subpath fitting the passed rectangle
+void wxGraphicsPath::AddCircle( wxDouble x, wxDouble y, wxDouble r )
+{
+    AllocExclusive();
+    GetPathData()->AddCircle(x,y,r);
+}
+
+// appends a an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) to (x2,y2), also a straight line from (current) to (x1,y1)
+void wxGraphicsPath::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r ) 
+{
+    GetPathData()->AddArcToPoint(x1,y1,x2,y2,r);
+}
+
+// appends an ellipse
+void wxGraphicsPath::AddEllipse( wxDouble x, wxDouble y, wxDouble w, wxDouble h)
+{
+    AllocExclusive();
+    GetPathData()->AddEllipse(x,y,w,h);
+}
+
+// appends a rounded rectangle
+void wxGraphicsPath::AddRoundedRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h, wxDouble radius)
+{
+    AllocExclusive();
+    GetPathData()->AddRoundedRectangle(x,y,w,h,radius);
+}
+
+// returns the native path
+void * wxGraphicsPath::GetNativePath() const
+{
+    return GetPathData()->GetNativePath();
+}
+
+// give the native path returned by GetNativePath() back (there might be some deallocations necessary)
+void wxGraphicsPath::UnGetNativePath(void *p)const
+{
+    GetPathData()->UnGetNativePath(p);
+}
+
+// transforms each point of this path by the matrix
+void wxGraphicsPath::Transform( const wxGraphicsMatrix& matrix )
+{
+    AllocExclusive();
+    GetPathData()->Transform(matrix.GetMatrixData());
+}
+
+// gets the bounding box enclosing all points (possibly including control points)
+void wxGraphicsPath::GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const
+{
+    GetPathData()->GetBox(x,y,w,h);
+}
+
+bool wxGraphicsPath::Contains( wxDouble x, wxDouble y, int fillStyle ) const
+{
+    return GetPathData()->Contains(x,y,fillStyle);
+}
+
+//
+// Emulations, these mus be implemented in the ...Data classes in order to allow for proper overrides
+//
+
+void wxGraphicsPathData::AddQuadCurveToPoint( wxDouble cx, wxDouble cy, wxDouble x, wxDouble y )

 {
     // calculate using degree elevation to a cubic bezier
     wxPoint2DDouble c1;
     wxPoint2DDouble c2;
 
 {
     // calculate using degree elevation to a cubic bezier
     wxPoint2DDouble c1;
     wxPoint2DDouble c2;
 

-    wxPoint2DDouble start = GetCurrentPoint();
+    wxPoint2DDouble start;
+    GetCurrentPoint(&start.m_x,&start.m_y);

     wxPoint2DDouble end(x,y);
     wxPoint2DDouble c(cx,cy);
     c1 = wxDouble(1/3.0) * start + wxDouble(2/3.0) * c;
     wxPoint2DDouble end(x,y);
     wxPoint2DDouble c(cx,cy);
     c1 = wxDouble(1/3.0) * start + wxDouble(2/3.0) * c;


@@ -114,7 +407,7 @@ void wxGraphicsPath::AddQuadCurveToPoint( wxDouble cx, wxDouble cy, wxDouble x,
     AddCurveToPoint(c1.m_x,c1.m_y,c2.m_x,c2.m_y,x,y);
 }
 
     AddCurveToPoint(c1.m_x,c1.m_y,c2.m_x,c2.m_y,x,y);
 }
 

-void wxGraphicsPath::AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h )
+void wxGraphicsPathData::AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h )

 {
     MoveToPoint(x,y);
     AddLineToPoint(x,y+h);
 {
     MoveToPoint(x,y);
     AddLineToPoint(x,y+h);


@@ -123,31 +416,29 @@ void wxGraphicsPath::AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble
     CloseSubpath();
 }
 
     CloseSubpath();
 }
 

-void wxGraphicsPath::AddCircle( wxDouble x, wxDouble y, wxDouble r )
+void wxGraphicsPathData::AddCircle( wxDouble x, wxDouble y, wxDouble r )

 {
     MoveToPoint(x+r,y);
     AddArc( x,y,r,0,2*M_PI,false);
     CloseSubpath();
 }
 
 {
     MoveToPoint(x+r,y);
     AddArc( x,y,r,0,2*M_PI,false);
     CloseSubpath();
 }
 

-void wxGraphicsPath::AddEllipse( wxDouble x, wxDouble y, wxDouble w, wxDouble h)
+void wxGraphicsPathData::AddEllipse( wxDouble x, wxDouble y, wxDouble w, wxDouble h)

 {
     wxDouble rw = w/2;
     wxDouble rh = h/2;
     wxDouble xc = x + rw;
     wxDouble yc = y + rh;
 {
     wxDouble rw = w/2;
     wxDouble rh = h/2;
     wxDouble xc = x + rw;
     wxDouble yc = y + rh;

-    wxGraphicsMatrix* m = GetRenderer()->CreateMatrix();
-    m->Translate(xc,yc);
-    m->Scale(rw/rh,1.0);
-    wxGraphicsPath* p = GetRenderer()->CreatePath();
-    p->AddCircle(0,0,rh);
-    p->Transform(m);
-    AddPath(p);
-    delete p;
-    delete m;
+    wxGraphicsMatrix m = GetRenderer()->CreateMatrix();
+    m.Translate(xc,yc);
+    m.Scale(rw/rh,1.0);
+    wxGraphicsPath p = GetRenderer()->CreatePath();
+    p.AddCircle(0,0,rh);
+    p.Transform(m);
+    AddPath(p.GetPathData());

 }
 
 }
 

-void wxGraphicsPath::AddRoundedRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h, wxDouble radius)
+void wxGraphicsPathData::AddRoundedRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h, wxDouble radius)

 {
     if ( radius == 0 )
         AddRectangle(x,y,w,h);
 {
     if ( radius == 0 )
         AddRectangle(x,y,w,h);


@@ -163,9 +454,10 @@ void wxGraphicsPath::AddRoundedRectangle( wxDouble x, wxDouble y, wxDouble w, wx
 }
 
 // draws a an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) to (x2,y2), also a straight line from (current) to (x1,y1)
 }
 
 // draws a an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) to (x2,y2), also a straight line from (current) to (x1,y1)

-void wxGraphicsPath::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r )
+void wxGraphicsPathData::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r )

 {   
 {   

-    wxPoint2DDouble current = GetCurrentPoint();
+    wxPoint2DDouble current;
+    GetCurrentPoint(&current.m_x,&current.m_y);

     wxPoint2DDouble p1(x1,y1);
     wxPoint2DDouble p2(x2,y2);
 
     wxPoint2DDouble p1(x1,y1);
     wxPoint2DDouble p2(x2,y2);
 


@@ -194,9 +486,9 @@ void wxGraphicsPath::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDo
     wxDouble a1 = v1.GetVectorAngle()+90;
     wxDouble a2 = v2.GetVectorAngle()-90;
 
     wxDouble a1 = v1.GetVectorAngle()+90;
     wxDouble a2 = v2.GetVectorAngle()-90;
 

-    AddLineToPoint(t1);
+    AddLineToPoint(t1.m_x,t1.m_y);

     AddArc(c.m_x,c.m_y,r,DegToRad(a1),DegToRad(a2),true);
     AddArc(c.m_x,c.m_y,r,DegToRad(a1),DegToRad(a2),true);

-    AddLineToPoint(p2);
+    AddLineToPoint(p2.m_x,p2.m_y);

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -208,69 +500,111 @@ IMPLEMENT_ABSTRACT_CLASS(wxGraphicsContext, wxObject)
 
 wxGraphicsContext::wxGraphicsContext(wxGraphicsRenderer* renderer) : wxGraphicsObject(renderer) 
 {
 
 wxGraphicsContext::wxGraphicsContext(wxGraphicsRenderer* renderer) : wxGraphicsObject(renderer) 
 {

-    m_pen = NULL;
-    m_releasePen = false;
-    m_brush = NULL;
-    m_releaseBrush = false;
-    m_font = NULL;
-    m_releaseFont = false;
+    m_logicalFunction = wxCOPY;

 }
 
 wxGraphicsContext::~wxGraphicsContext() 
 {
 }
 
 wxGraphicsContext::~wxGraphicsContext() 
 {

-    wxASSERT_MSG( m_pen == NULL , wxT("No pen should be selected during destruction") );
-    wxASSERT_MSG( m_brush == NULL , wxT("No pen should be selected during destruction") );
+}
+
+bool wxGraphicsContext::StartDoc(const wxString& WXUNUSED(message)) 
+{
+    return true;
+}
+    
+void wxGraphicsContext::EndDoc()
+{
+}
+
+void wxGraphicsContext::StartPage(wxDouble WXUNUSED(width),
+                                  wxDouble WXUNUSED(height))
+{
+}
+    
+void wxGraphicsContext::EndPage()
+{
+}
+
+void wxGraphicsContext::Flush()
+{
+}
+
+#if 0
+void wxGraphicsContext::SetAlpha( wxDouble WXUNUSED(alpha) )
+{
+}
+    
+wxDouble wxGraphicsContext::GetAlpha() const
+{
+    return 1.0;
+}
+#endif
+
+void wxGraphicsContext::GetSize( wxDouble* width, wxDouble* height)
+{
+    *width = 10000.0;
+    *height = 10000.0;
+}
+
+void wxGraphicsContext::GetDPI( wxDouble* dpiX, wxDouble* dpiY)
+{
+    *dpiX = 72.0;
+    *dpiY = 72.0;

 }
 
 // sets the pen
 }
 
 // sets the pen

-void wxGraphicsContext::SetPen( wxGraphicsPen* pen , bool release ) 
+void wxGraphicsContext::SetPen( const wxGraphicsPen& pen ) 

 {
 {

-    if ( m_releasePen )
-        delete m_pen;

     m_pen = pen;
     m_pen = pen;

-    m_releasePen = release;

 }
 
 void wxGraphicsContext::SetPen( const wxPen& pen )
 {
 }
 
 void wxGraphicsContext::SetPen( const wxPen& pen )
 {

-    if ( pen.GetStyle() == wxTRANSPARENT )
-        SetPen( NULL );
+    if ( !pen.Ok() || pen.GetStyle() == wxTRANSPARENT )
+        SetPen( wxNullGraphicsPen );

     else
         SetPen( CreatePen( pen ) );
 }
     
 // sets the brush for filling
     else
         SetPen( CreatePen( pen ) );
 }
     
 // sets the brush for filling

-void wxGraphicsContext::SetBrush( wxGraphicsBrush* brush , bool release ) 
+void wxGraphicsContext::SetBrush( const wxGraphicsBrush& brush ) 

 {
 {

-    if ( m_releaseBrush )
-        delete m_brush;

     m_brush = brush;
     m_brush = brush;

-    m_releaseBrush = release;

 }
 
 void wxGraphicsContext::SetBrush( const wxBrush& brush )
 {
 }
 
 void wxGraphicsContext::SetBrush( const wxBrush& brush )
 {

-    if ( brush.GetStyle() == wxTRANSPARENT )
-        SetBrush( NULL );
+    if ( !brush.Ok() || brush.GetStyle() == wxTRANSPARENT )
+        SetBrush( wxNullGraphicsBrush );

     else
         SetBrush( CreateBrush( brush ) );
 }
 
 // sets the brush for filling
     else
         SetBrush( CreateBrush( brush ) );
 }
 
 // sets the brush for filling

-void wxGraphicsContext::SetFont( wxGraphicsFont* font , bool release ) 
+void wxGraphicsContext::SetFont( const wxGraphicsFont& font ) 

 {
 {

-    if ( m_releaseFont )
-        delete m_font;

     m_font = font;
     m_font = font;

-    m_releaseFont = release;
+}
+
+bool wxGraphicsContext::SetLogicalFunction( int function )
+{
+    if ( function == wxCOPY )
+    {
+        m_logicalFunction = function;
+        return true;
+    }
+    return false;

 }
 
 void wxGraphicsContext::SetFont( const wxFont& font, const wxColour& colour )
 {
 }
 
 void wxGraphicsContext::SetFont( const wxFont& font, const wxColour& colour )
 {

-    SetFont( CreateFont( font, colour ) );
+    if ( font.Ok() )
+        SetFont( CreateFont( font, colour ) );
+    else
+        SetFont( wxNullGraphicsFont );

 }
 
 }
 

-void wxGraphicsContext::DrawPath( const wxGraphicsPath *path, int fillStyle )
+void wxGraphicsContext::DrawPath( const wxGraphicsPath& path, int fillStyle )

 {
     FillPath( path , fillStyle );
     StrokePath( path );
 {
     FillPath( path , fillStyle );
     StrokePath( path );


@@ -285,118 +619,188 @@ void wxGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, w
     Translate(-x,-y);
 }
 
     Translate(-x,-y);
 }
 

+void wxGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, const wxGraphicsBrush& backgroundBrush ) 
+{
+    wxGraphicsBrush formerBrush = m_brush;
+       wxGraphicsPen formerPen = m_pen;
+    wxDouble width;
+    wxDouble height;
+    wxDouble descent;
+    wxDouble externalLeading;
+    GetTextExtent( str , &width, &height, &descent, &externalLeading );
+    SetBrush( backgroundBrush );
+       // to make sure our 'OffsetToPixelBoundaries' doesn't move the fill shape
+       SetPen( wxNullGraphicsPen );
+
+    wxGraphicsPath path = CreatePath();
+    path.AddRectangle( x , y, width, height );
+    FillPath( path );
+
+    DrawText( str, x ,y);
+    SetBrush( formerBrush );
+       SetPen( formerPen );
+}
+
+void wxGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, wxDouble angle, const wxGraphicsBrush& backgroundBrush )
+{
+    wxGraphicsBrush formerBrush = m_brush;
+       wxGraphicsPen formerPen = m_pen;
+
+    wxDouble width;
+    wxDouble height;
+    wxDouble descent;
+    wxDouble externalLeading;
+    GetTextExtent( str , &width, &height, &descent, &externalLeading );
+    SetBrush( backgroundBrush );
+       // to make sure our 'OffsetToPixelBoundaries' doesn't move the fill shape
+       SetPen( wxNullGraphicsPen );
+
+    wxGraphicsPath path = CreatePath();
+    path.MoveToPoint( x , y );
+    path.AddLineToPoint( (int) (x + sin(angle) * height) , (int) (y + cos(angle) * height) );
+    path.AddLineToPoint(
+        (int) (x + sin(angle) * height + cos(angle) * width) ,
+        (int) (y + cos(angle) * height - sin(angle) * width));
+    path.AddLineToPoint((int) (x + cos(angle) * width) , (int) (y - sin(angle) * width) );
+    FillPath( path );
+    DrawText( str, x ,y, angle);
+    SetBrush( formerBrush );
+       SetPen( formerPen );
+}
+

 void wxGraphicsContext::StrokeLine( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2)
 {
 void wxGraphicsContext::StrokeLine( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2)
 {

-    wxGraphicsPath* path = CreatePath();
-    path->MoveToPoint(x1, y1);
-    path->AddLineToPoint( x2, y2 );
+    wxGraphicsPath path = CreatePath();
+    path.MoveToPoint(x1, y1);
+    path.AddLineToPoint( x2, y2 );

     StrokePath( path );
     StrokePath( path );

-    delete path;

 }
 
 void wxGraphicsContext::DrawRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h)
 {
 }
 
 void wxGraphicsContext::DrawRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h)
 {

-    wxGraphicsPath* path = CreatePath();
-    path->AddRectangle( x , y , w , h );
+    wxGraphicsPath path = CreatePath();
+    path.AddRectangle( x , y , w , h );

     DrawPath( path );
     DrawPath( path );

-    delete path;

 }
 
 void wxGraphicsContext::DrawEllipse( wxDouble x, wxDouble y, wxDouble w, wxDouble h)
 {
 }
 
 void wxGraphicsContext::DrawEllipse( wxDouble x, wxDouble y, wxDouble w, wxDouble h)
 {

-    wxGraphicsPath* path = CreatePath();
-    path->AddEllipse(x,y,w,h);
+    wxGraphicsPath path = CreatePath();
+    path.AddEllipse(x,y,w,h);

     DrawPath(path);
     DrawPath(path);

-    delete path;

 }
 
 void wxGraphicsContext::DrawRoundedRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h, wxDouble radius)
 {
 }
 
 void wxGraphicsContext::DrawRoundedRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h, wxDouble radius)
 {

-    wxGraphicsPath* path = CreatePath();
-    path->AddRoundedRectangle(x,y,w,h,radius);
+    wxGraphicsPath path = CreatePath();
+    path.AddRoundedRectangle(x,y,w,h,radius);

     DrawPath(path);
     DrawPath(path);

-    delete path;

 }
 
 void wxGraphicsContext::StrokeLines( size_t n, const wxPoint2DDouble *points)
 {
     wxASSERT(n > 1);
 }
 
 void wxGraphicsContext::StrokeLines( size_t n, const wxPoint2DDouble *points)
 {
     wxASSERT(n > 1);

-    wxGraphicsPath* path = CreatePath();
-    path->MoveToPoint(points[0].m_x, points[0].m_y);
+    wxGraphicsPath path = CreatePath();
+    path.MoveToPoint(points[0].m_x, points[0].m_y);

     for ( size_t i = 1; i < n; ++i)
     for ( size_t i = 1; i < n; ++i)

-        path->AddLineToPoint( points[i].m_x, points[i].m_y );
+        path.AddLineToPoint( points[i].m_x, points[i].m_y );

     StrokePath( path );
     StrokePath( path );

-    delete path;

 }
 
 void wxGraphicsContext::DrawLines( size_t n, const wxPoint2DDouble *points, int fillStyle)
 {
     wxASSERT(n > 1);
 }
 
 void wxGraphicsContext::DrawLines( size_t n, const wxPoint2DDouble *points, int fillStyle)
 {
     wxASSERT(n > 1);

-    wxGraphicsPath* path = CreatePath();
-    path->MoveToPoint(points[0].m_x, points[0].m_y);
+    wxGraphicsPath path = CreatePath();
+    path.MoveToPoint(points[0].m_x, points[0].m_y);

     for ( size_t i = 1; i < n; ++i)
     for ( size_t i = 1; i < n; ++i)

-        path->AddLineToPoint( points[i].m_x, points[i].m_y );
+        path.AddLineToPoint( points[i].m_x, points[i].m_y );

     DrawPath( path , fillStyle);
     DrawPath( path , fillStyle);

-    delete path;

 }
 
 void wxGraphicsContext::StrokeLines( size_t n, const wxPoint2DDouble *beginPoints, const wxPoint2DDouble *endPoints)
 {
     wxASSERT(n > 0);
 }
 
 void wxGraphicsContext::StrokeLines( size_t n, const wxPoint2DDouble *beginPoints, const wxPoint2DDouble *endPoints)
 {
     wxASSERT(n > 0);

-    wxGraphicsPath* path = CreatePath();
+    wxGraphicsPath path = CreatePath();

     for ( size_t i = 0; i < n; ++i)
     {
     for ( size_t i = 0; i < n; ++i)
     {

-        path->MoveToPoint(beginPoints[i].m_x, beginPoints[i].m_y);
-        path->AddLineToPoint( endPoints[i].m_x, endPoints[i].m_y );
+        path.MoveToPoint(beginPoints[i].m_x, beginPoints[i].m_y);
+        path.AddLineToPoint( endPoints[i].m_x, endPoints[i].m_y );

     }
     StrokePath( path );
     }
     StrokePath( path );

-    delete path;

 }
 
 // create a 'native' matrix corresponding to these values
 }
 
 // create a 'native' matrix corresponding to these values

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

 {
     return GetRenderer()->CreateMatrix(a,b,c,d,tx,ty);
 }
 
 {
     return GetRenderer()->CreateMatrix(a,b,c,d,tx,ty);
 }
 

-wxGraphicsPath * wxGraphicsContext::CreatePath()
+wxGraphicsPath wxGraphicsContext::CreatePath() const

 {
     return GetRenderer()->CreatePath();
 }
 
 {
     return GetRenderer()->CreatePath();
 }
 

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

 {
     return GetRenderer()->CreatePen(pen);
 }
 
 {
     return GetRenderer()->CreatePen(pen);
 }
 

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

 {
     return GetRenderer()->CreateBrush(brush);
 }
 
 // sets the brush to a linear gradient, starting at (x1,y1) with color c1 to (x2,y2) with color c2
 {
     return GetRenderer()->CreateBrush(brush);
 }
 
 // sets the brush to a linear gradient, starting at (x1,y1) with color c1 to (x2,y2) with color c2

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

 {
     return GetRenderer()->CreateLinearGradientBrush(x1,y1,x2,y2,c1,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
 {
     return GetRenderer()->CreateLinearGradientBrush(x1,y1,x2,y2,c1,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

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

 {
     return GetRenderer()->CreateRadialGradientBrush(xo,yo,xc,yc,radius,oColor,cColor);
 }
 
 // sets the font
 {
     return GetRenderer()->CreateRadialGradientBrush(xo,yo,xc,yc,radius,oColor,cColor);
 }
 
 // sets the font

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

 {
     return GetRenderer()->CreateFont(font,col);
 }
 
 {
     return GetRenderer()->CreateFont(font,col);
 }
 

-wxGraphicsContext* wxGraphicsContext::Create( const wxWindowDC& dc) 
+wxGraphicsBitmap wxGraphicsContext::CreateBitmap( const wxBitmap& bmp ) const
+{
+#ifndef __WXGTK20__
+    return GetRenderer()->CreateBitmap(bmp);
+#else
+    return wxNullGraphicsBitmap;
+#endif
+}
+
+wxGraphicsBitmap wxGraphicsContext::CreateSubBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h   ) const
+{
+#ifndef __WXGTK20__
+    return GetRenderer()->CreateSubBitmap(bmp,x,y,w,h);
+#else
+    return wxNullGraphicsBitmap;
+#endif
+}
+
+/* static */ wxGraphicsContext* wxGraphicsContext::Create( const wxWindowDC& dc) 
+{
+    return wxGraphicsRenderer::GetDefaultRenderer()->CreateContext(dc);
+}
+
+/* static */ wxGraphicsContext* wxGraphicsContext::Create( const wxMemoryDC& dc) 
+{
+    return wxGraphicsRenderer::GetDefaultRenderer()->CreateContext(dc);
+}
+
+/* static */ wxGraphicsContext* wxGraphicsContext::Create( const wxPrinterDC& dc) 

 {
     return wxGraphicsRenderer::GetDefaultRenderer()->CreateContext(dc);
 }
 {
     return wxGraphicsRenderer::GetDefaultRenderer()->CreateContext(dc);
 }


@@ -416,4 +820,15 @@ wxGraphicsContext* wxGraphicsContext::Create( wxWindow* window )
     return wxGraphicsRenderer::GetDefaultRenderer()->CreateContext(window);
 }
 
     return wxGraphicsRenderer::GetDefaultRenderer()->CreateContext(window);
 }
 

+wxGraphicsContext* wxGraphicsContext::Create()
+{
+    return wxGraphicsRenderer::GetDefaultRenderer()->CreateMeasuringContext();
+}
+
+//-----------------------------------------------------------------------------
+// wxGraphicsRenderer
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_ABSTRACT_CLASS(wxGraphicsRenderer, wxObject)
+

 #endif // wxUSE_GRAPHICS_CONTEXT
 #endif // wxUSE_GRAPHICS_CONTEXT