More aui updates

[wxWidgets.git] / wxPython / src / _graphics.i

diff --git a/wxPython/src/_graphics.i b/wxPython/src/_graphics.i
index 7466b8a0c8db896968fbdba0321fc740485ed41a..2eafd0be1b18b3295821ebb45181ab05b3c48450 100644 (file)
--- a/wxPython/src/_graphics.i
+++ b/wxPython/src/_graphics.i
@@ -24,14 +24,16 @@
 // functions in this file
 %threadWrapperOff
 
 // functions in this file
 %threadWrapperOff
 

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

 
 

+//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------

 
 %{
 #if !wxUSE_GRAPHICS_CONTEXT
 // C++ stub classes for platforms or build configurations that don't have
 // wxGraphicsContext yet.
 
 
 %{
 #if !wxUSE_GRAPHICS_CONTEXT
 // C++ stub classes for platforms or build configurations that don't have
 // wxGraphicsContext yet.
 

+

 class wxGraphicsObject : public wxObject
 {
 public :
 class wxGraphicsObject : public wxObject
 {
 public :


@@ -41,32 +43,40 @@ public :
     }
     wxGraphicsObject( const wxGraphicsObject&  ) {}
     virtual ~wxGraphicsObject() {}
     }
     wxGraphicsObject( const wxGraphicsObject&  ) {}
     virtual ~wxGraphicsObject() {}

+    bool IsNull() const { return false; }

     wxGraphicsRenderer* GetRenderer() const { return NULL; }
 } ;
 
     wxGraphicsRenderer* GetRenderer() const { return NULL; }
 } ;
 

+
+

 class wxGraphicsPen : public wxGraphicsObject
 {
 class wxGraphicsPen : public wxGraphicsObject
 {

-    //wxGraphicsPen(wxGraphicsRenderer* )  {}
+    wxGraphicsPen()  {}

     virtual ~wxGraphicsPen() {}
     virtual ~wxGraphicsPen() {}

-    virtual void Apply( wxGraphicsContext* ) {}
-    virtual wxDouble GetWidth() { return 0; }

 } ;
 } ;

+wxGraphicsPen wxNullGraphicsPen;
+
+

 
 class wxGraphicsBrush : public wxGraphicsObject
 {
 public :
 
 class wxGraphicsBrush : public wxGraphicsObject
 {
 public :

-    //wxGraphicsBrush(wxGraphicsRenderer* renderer) {}
+    wxGraphicsBrush() {}

     virtual ~wxGraphicsBrush() {}
     virtual ~wxGraphicsBrush() {}

-    virtual void Apply( wxGraphicsContext* ) {}

 } ;
 } ;

+wxGraphicsBrush wxNullGraphicsBrush;
+
+

 
 class wxGraphicsFont : public wxGraphicsObject
 {
 public :
 
 class wxGraphicsFont : public wxGraphicsObject
 {
 public :

-    //wxGraphicsFont(wxGraphicsRenderer* renderer) {}
+    wxGraphicsFont() {}

     virtual ~wxGraphicsFont() {}
     virtual ~wxGraphicsFont() {}

-    virtual void Apply( wxGraphicsContext* ) {}

 } ;
 } ;

+wxGraphicsFont wxNullGraphicsFont;
+
+

 
 class wxGraphicsPath : public wxGraphicsObject
 {
 
 class wxGraphicsPath : public wxGraphicsObject
 {


@@ -77,8 +87,6 @@ public :
     }
     virtual ~wxGraphicsPath() {}
 
     }
     virtual ~wxGraphicsPath() {}
 

-    virtual wxGraphicsPath *Clone() const { return NULL; }
-

     void MoveToPoint( wxDouble, wxDouble ) {}
     void MoveToPoint( const wxPoint2DDouble& ) {}
     void AddLineToPoint( wxDouble, wxDouble ) {}
     void MoveToPoint( wxDouble, wxDouble ) {}
     void MoveToPoint( const wxPoint2DDouble& ) {}
     void AddLineToPoint( wxDouble, wxDouble ) {}


@@ -108,6 +116,7 @@ public :
     bool Contains( wxDouble , wxDouble , int ) { return false; }
     bool Contains( const wxPoint2DDouble& , int ) { return false; }
 };
     bool Contains( wxDouble , wxDouble , int ) { return false; }
     bool Contains( const wxPoint2DDouble& , int ) { return false; }
 };

+wxGraphicsPath wxNullGraphicsPath;

 
 
 class wxGraphicsMatrix : public wxGraphicsObject
 
 
 class wxGraphicsMatrix : public wxGraphicsObject


@@ -118,7 +127,6 @@ public :
                         "wx.GraphicsMatrix is not available on this platform.");
     }
     virtual ~wxGraphicsMatrix() {}
                         "wx.GraphicsMatrix is not available on this platform.");
     }
     virtual ~wxGraphicsMatrix() {}

-    virtual wxGraphicsMatrix *Clone() const { return NULL; }

     virtual void Concat( const wxGraphicsMatrix * ) {}
     virtual void Copy( const wxGraphicsMatrix * )  {}
     virtual void Set(wxDouble , wxDouble , wxDouble , wxDouble ,
     virtual void Concat( const wxGraphicsMatrix * ) {}
     virtual void Copy( const wxGraphicsMatrix * )  {}
     virtual void Set(wxDouble , wxDouble , wxDouble , wxDouble ,


@@ -133,7 +141,7 @@ public :
     virtual void TransformDistance( wxDouble *, wxDouble * ) {}
     virtual void * GetNativeMatrix() const { return NULL; }
 };
     virtual void TransformDistance( wxDouble *, wxDouble * ) {}
     virtual void * GetNativeMatrix() const { return NULL; }
 };

-
+wxGraphicsMatrix wxNullGraphicsMatrix;

 
 
 class wxGraphicsContext : public wxGraphicsObject
 
 
 class wxGraphicsContext : public wxGraphicsObject


@@ -169,18 +177,18 @@ public:
 
     wxGraphicsPath * CreatePath()  { return NULL; }
 
 
     wxGraphicsPath * CreatePath()  { return NULL; }
 

-    virtual wxGraphicsPen* CreatePen(const wxPen& )  { return NULL; }
+    virtual wxGraphicsPen CreatePen(const wxPen& )  { return NULL; }

 
 

-    virtual wxGraphicsBrush* CreateBrush(const wxBrush& ) { return NULL; }
+    virtual wxGraphicsBrush CreateBrush(const wxBrush& ) { return NULL; }

 
 

-    virtual wxGraphicsBrush* CreateLinearGradientBrush( wxDouble , wxDouble , wxDouble , wxDouble ,
+    virtual wxGraphicsBrush CreateLinearGradientBrush( wxDouble , wxDouble , wxDouble , wxDouble ,

                                                         const wxColour&, const wxColour&) { return NULL; }
 
                                                         const wxColour&, const wxColour&) { return NULL; }
 

-    virtual wxGraphicsBrush* CreateRadialGradientBrush( wxDouble xo, wxDouble yo,
+    virtual wxGraphicsBrush CreateRadialGradientBrush( wxDouble xo, wxDouble yo,

                                                         wxDouble xc, wxDouble yc, wxDouble radius,
                                                         const wxColour &oColor, const wxColour &cColor) { return NULL; }
 
                                                         wxDouble xc, wxDouble yc, wxDouble radius,
                                                         const wxColour &oColor, const wxColour &cColor) { return NULL; }
 

-    virtual wxGraphicsFont* CreateFont( const wxFont &, const wxColour & )  { return NULL; }
+    virtual wxGraphicsFont CreateFont( const wxFont &, const wxColour & )  { return NULL; }

 
     virtual wxGraphicsMatrix* CreateMatrix( wxDouble, wxDouble, wxDouble, wxDouble,
                                             wxDouble, wxDouble)  { return NULL; }
 
     virtual wxGraphicsMatrix* CreateMatrix( wxDouble, wxDouble, wxDouble, wxDouble,
                                             wxDouble, wxDouble)  { return NULL; }


@@ -198,13 +206,13 @@ public:
     virtual void SetTransform( const wxGraphicsMatrix* ) {}
     virtual void GetTransform( wxGraphicsMatrix* ) {}
 
     virtual void SetTransform( const wxGraphicsMatrix* ) {}
     virtual void GetTransform( wxGraphicsMatrix* ) {}
 

-    virtual void SetPen( wxGraphicsPen* , bool ) {}
+    virtual void SetPen( const wxGraphicsPen& ) {}

     void SetPen( const wxPen& ) {}
 
     void SetPen( const wxPen& ) {}
 

-    virtual void SetBrush( wxGraphicsBrush* , bool ) {}
+    virtual void SetBrush( const wxGraphicsBrush& ) {}

     void SetBrush( const wxBrush& ) {}
 
     void SetBrush( const wxBrush& ) {}
 

-    virtual void SetFont( wxGraphicsFont*, bool ) {}
+    virtual void SetFont( const wxGraphicsFont& ) {}

     void SetFont( const wxFont&, const wxColour& ) {}
 
     virtual void StrokePath( const wxGraphicsPath * ) {}
     void SetFont( const wxFont&, const wxColour& ) {}
 
     virtual void StrokePath( const wxGraphicsPath * ) {}


@@ -254,17 +262,15 @@ public :
     virtual wxGraphicsPath * CreatePath()  { return NULL; }
 
     virtual wxGraphicsMatrix * CreateMatrix( wxDouble , wxDouble , wxDouble , wxDouble ,
     virtual wxGraphicsPath * CreatePath()  { return NULL; }
 
     virtual wxGraphicsMatrix * CreateMatrix( wxDouble , wxDouble , wxDouble , wxDouble ,

-                                             wxDouble , wxDouble ) {}
-
-    virtual wxGraphicsPen* CreatePen(const wxPen& )  { return NULL; }
-    virtual wxGraphicsBrush* CreateBrush(const wxBrush&  )  { return NULL; }
-    virtual wxGraphicsBrush* CreateLinearGradientBrush(
-        wxDouble , wxDouble , wxDouble , wxDouble ,
-        const wxColour&, const wxColour&)  { return NULL; }
-    virtual wxGraphicsBrush* CreateRadialGradientBrush(
-        wxDouble , wxDouble , wxDouble , wxDouble , wxDouble ,
-        const wxColour &, const wxColour &)  { return NULL; }
-    virtual wxGraphicsFont* CreateFont( const wxFont & , const wxColour & ) { return NULL; }
+                                             wxDouble , wxDouble ) { return NULL; }
+
+    virtual wxGraphicsPen CreatePen(const wxPen& )  { return wxNullGaphicsPen; }
+    virtual wxGraphicsBrush CreateBrush(const wxBrush&  )  { return wxNullGaphicsBrush; }
+    virtual wxGraphicsBrush CreateLinearGradientBrush(xDouble , wxDouble , wxDouble , wxDouble ,
+                                                      const wxColour&, const wxColour&)  { return wxNullGaphicsBrush; }
+    virtual wxGraphicsBrush CreateRadialGradientBrush(wxDouble , wxDouble , wxDouble , wxDouble , wxDouble ,
+                                                      const wxColour &, const wxColour &)  { return wxNullGaphicsBrush; }
+    virtual wxGraphicsFont CreateFont( const wxFont & , const wxColour & ) { return wxNullGaphicsFont; }

 };
 
 
 };
 
 


@@ -316,308 +322,371 @@ MustHaveApp(wxGCDC);
 typedef double wxDouble;
 
 
 typedef double wxDouble;
 
 

+//---------------------------------------------------------------------------
+

 
 

+DocStr(wxGraphicsObject,
+"This class is the superclass of native graphics objects like pens
+etc. It provides the internal reference counting.  It is not to be
+instantiated by user code.", "");

 class wxGraphicsObject : public wxObject
 {
 public :
     wxGraphicsObject( wxGraphicsRenderer* renderer = NULL );
     virtual ~wxGraphicsObject();
 class wxGraphicsObject : public wxObject
 {
 public :
     wxGraphicsObject( wxGraphicsRenderer* renderer = NULL );
     virtual ~wxGraphicsObject();

-    wxGraphicsRenderer* GetRenderer() const;
+    
+    DocDeclStr(
+        bool , IsNull() const ,
+        "Is this object valid (false) or still empty (true)?", "");
+    
+    DocDeclStr(
+        wxGraphicsRenderer* , GetRenderer() const,
+        "Returns the renderer that was used to create this instance, or
+``None`` if it has not been initialized yet.", "");
+    

 };
 
 
 };
 
 

+DocStr(wxGraphicsPen,
+"A wx.GraphicsPen is a native representation of a pen. It is used for
+stroking a path on a `wx.GraphicsContext`. The contents are specific and
+private to the respective renderer. The only way to get a valid instance
+is via a CreatePen call on the graphics context or the renderer
+instance.", "");

 class wxGraphicsPen : public wxGraphicsObject
 {
 public :
 class wxGraphicsPen : public wxGraphicsObject
 {
 public :

-    //wxGraphicsPen(wxGraphicsRenderer* renderer);
+    wxGraphicsPen();

     virtual ~wxGraphicsPen();
     virtual ~wxGraphicsPen();

-    virtual void Apply( wxGraphicsContext* context);
-    virtual wxDouble GetWidth();

 };
 
 };
 

-
+DocStr(wxGraphicsBrush,
+"A wx.GraphicsBrush is a native representation of a brush. It is used
+for filling a path on a `wx.GraphicsContext`. The contents are
+specific and private to the respective renderer. The only way to get a
+valid instance is via a Create...Brush call on the graphics context or
+the renderer instance.", "");

 class wxGraphicsBrush : public wxGraphicsObject
 {
 public :
 class wxGraphicsBrush : public wxGraphicsObject
 {
 public :

-    //wxGraphicsBrush(wxGraphicsRenderer* renderer);
+    wxGraphicsBrush();

     virtual ~wxGraphicsBrush();
     virtual ~wxGraphicsBrush();

-    virtual void Apply( wxGraphicsContext* context);

 };
 
 
 };
 
 

+DocStr(wxGraphicsFont,
+"A `wx.GraphicsFont` is a native representation of a font (including
+text colour). The contents are specific an private to the respective
+renderer.  The only way to get a valid instance is via a CreateFont
+call on the graphics context or the renderer instance.", "");

 class wxGraphicsFont : public wxGraphicsObject
 {
 public :
 class wxGraphicsFont : public wxGraphicsObject
 {
 public :

-    //wxGraphicsFont(wxGraphicsRenderer* renderer);
+    wxGraphicsFont();

     virtual ~wxGraphicsFont();
     virtual ~wxGraphicsFont();

-    virtual void Apply( wxGraphicsContext* context);

 };
 
 };
 

+

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

-class wxGraphicsPath : public wxGraphicsObject
+DocStr(wxGraphicsMatrix,
+"A wx.GraphicsMatrix is a native representation of an affine
+matrix. The contents are specific an private to the respective
+renderer. The only way to get a valid instance is via a CreateMatrix
+call on the graphics context or the renderer instance.", "");
+class wxGraphicsMatrix : public wxGraphicsObject

 {
 public :
 {
 public :

-    //wxGraphicsPath(wxGraphicsRenderer* renderer);            *** This class is an ABC, so we can't allow instances to be created directly
-    virtual ~wxGraphicsPath();
-
-    virtual wxGraphicsPath *Clone() const = 0;
+    wxGraphicsMatrix(); 
+    virtual ~wxGraphicsMatrix();

 
     DocDeclStr(
 
     DocDeclStr(

-        virtual void , MoveToPoint( wxDouble x, wxDouble y ),
-        "Begins a new subpath at (x,y)", "");
-//    void MoveToPoint( const wxPoint2D& p);
+        virtual void , Concat( const wxGraphicsMatrix& t ),
+        "Concatenates the passed in matrix to the current matrix.", "");
+
+//     %extend  {
+//         DocStr(Copy,
+//                "Copy the passed in matrix to this one.", "");
+//         void Copy( const wxGraphicsMatrix& t ) {
+//             *self = t;
+//         }
+//     }

 
 
     DocDeclStr(
 
 
     DocDeclStr(

-        virtual void , AddLineToPoint( wxDouble x, wxDouble y ),
-        "Adds a straight line from the current point to (x,y) ", "");
-//    void AddLineToPoint( const wxPoint2D& p);
+        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),
+        "Sets the matrix to the specified values (default values are the
+identity matrix.)", "");

 
 
     DocDeclStr(
 
 
     DocDeclStr(

-        virtual void , AddCurveToPoint( wxDouble cx1, wxDouble cy1,
-                                        wxDouble cx2, wxDouble cy2,
-                                        wxDouble x, wxDouble y ),
-        "Adds a cubic Bezier curve from the current point, using two control
-points and an end point", "");
-//    void AddCurveToPoint( const wxPoint2D& c1, const wxPoint2D& c2, const wxPoint2D& e);
-
+        virtual void , Invert(),
+        "Inverts the matrix.", "");

 
 
     DocDeclStr(
 
 
     DocDeclStr(

-        virtual void , AddPath( const wxGraphicsPath* path ),
-        "adds another path", "");
+        virtual bool , IsEqual( const wxGraphicsMatrix& t) const,
+        "Returns ``True`` if the elements of the transformation matrix are equal", "");

 
 
     DocDeclStr(
 
 
     DocDeclStr(

-        virtual void , CloseSubpath(),
-        "closes the current sub-path", "");
+        virtual bool , IsIdentity() const,
+        "Returns ``True`` if this is the identity matrix", "");

 
 
 
 

-    //virtual void , GetCurrentPoint( wxDouble& x, wxDouble&y),

     DocDeclStr(
     DocDeclStr(

-        wxPoint2D , GetCurrentPoint(),
-        "Gets the last point of the current path, (0,0) if not yet set", "");
+        virtual void , Translate( wxDouble dx , wxDouble dy ),
+        "Add a translation to this matrix.", "");

 
 
     DocDeclStr(
 
 
     DocDeclStr(

-        virtual void , AddArc( wxDouble x, wxDouble y, wxDouble r,
-                               wxDouble startAngle, wxDouble endAngle, bool clockwise ),
-        "Adds an arc of a circle centering at (x,y) with radius (r) from
-startAngle to endAngle", "");
-//    void AddArc( const wxPoint2D& c, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise);
+        virtual void , Scale( wxDouble xScale , wxDouble yScale ),
+        "Scales this matrix.", "");

 
 
     DocDeclStr(
 
 
     DocDeclStr(

-        virtual void , AddQuadCurveToPoint( wxDouble cx, wxDouble cy, wxDouble x, wxDouble y ),
-        "Adds a quadratic Bezier curve from the current point, using a control
-point and an end point", "");
+        virtual void , Rotate( wxDouble angle ),
+        "Rotates this matrix.  The angle should be specified in radians.", "");

 
 
 
 

-    DocDeclStr(
-        virtual void , AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h ),
-        "Appends a rectangle as a new closed subpath", "");
+    DocDeclAStr(
+        virtual void , TransformPoint( wxDouble *INOUT, wxDouble *INOUT ) const,
+        "TransformPoint(self, x, y) --> (x, y)",
+        "Applies this matrix to a point, returns the resulting point values", "");

 
 
 
 

-    DocDeclStr(
-        virtual void , AddCircle( wxDouble x, wxDouble y, wxDouble r ),
-        "Appends a circle as a new closed subpath with the given radius.", "");
+    DocDeclAStr(
+        virtual void , TransformDistance( wxDouble *INOUT, wxDouble *INOUT ) const,
+        "TransformDistance(self, dx, dy) --> (dx, dy)",
+        "Applies this matrix to a distance (ie. performs all transforms except
+translations)", "");

 
 
     DocDeclStr(
 
 
     DocDeclStr(

-        virtual void , AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r ) ,
-        "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)", "");
+        virtual void * , GetNativeMatrix() const,
+        "Returns the native representation of the matrix. For CoreGraphics this
+is a CFAffineMatrix pointer. For GDIPlus a Matrix Pointer and for
+Cairo a cairo_matrix_t pointer.  NOTE: For wxPython we still need a
+way to make this value usable.", "");
+};

 
 

+//---------------------------------------------------------------------------

 
 

-    DocDeclStr(
-        virtual void , AddEllipse( wxDouble x, wxDouble y, wxDouble w, wxDouble h),
-        "appends an ellipse", "");
+class wxGraphicsPath : public wxGraphicsObject
+{
+public :
+    wxGraphicsPath();
+    virtual ~wxGraphicsPath();

 
 
 
 

-    DocDeclStr(
-        virtual void , AddRoundedRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h, wxDouble radius),
-        "appends a rounded rectangle", "");
+    %nokwargs MoveToPoint;
+    DocStr(MoveToPoint,
+           "Begins a new subpath at the specified point.", "");
+    virtual void  MoveToPoint( wxDouble x, wxDouble y );
+    void MoveToPoint( const wxPoint2D& p);

 
 
 
 

-    DocDeclStr(
-        virtual void * , GetNativePath() const,
-        "returns the native path", "");
+    %nokwargs AddLineToPoint;
+    DocStr(AddLineToPoint,
+        "Adds a straight line from the current point to the specified point.", "");
+    virtual void AddLineToPoint( wxDouble x, wxDouble y );
+    void AddLineToPoint( const wxPoint2D& p);

 
 
 
 

-    DocDeclStr(
-        virtual void , UnGetNativePath(void *p),
-        "give the native path returned by GetNativePath() back (there might be some
-deallocations necessary)", "");
+    %nokwargs AddCurveToPoint;
+    DocStr(AddCurveToPoint,
+        "Adds a cubic Bezier curve from the current point, using two control
+points and an end point", "");
+    virtual void AddCurveToPoint( wxDouble cx1, wxDouble cy1,
+                                  wxDouble cx2, wxDouble cy2,
+                                  wxDouble x, wxDouble y );
+    void AddCurveToPoint( const wxPoint2D& c1, const wxPoint2D& c2, const wxPoint2D& e);
+

 
 
     DocDeclStr(
 
 
     DocDeclStr(

-        virtual void , Transform( wxGraphicsMatrix* matrix ),
-        "transforms each point of this path by the matrix", "");
+        virtual void , AddPath( const wxGraphicsPath& path ),
+        "Adds another path", "");

 
 
 
 

-    //virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) =0;

     DocDeclStr(
     DocDeclStr(

-        wxRect2DDouble , GetBox(),
-        "gets the bounding box enclosing all points (possibly including control points)", "");
+        virtual void , CloseSubpath(),
+        "Closes the current sub-path.", "");

 
 
     DocDeclStr(
 
 
     DocDeclStr(

-        virtual bool , Contains( wxDouble x, wxDouble y, int fillStyle = wxWINDING_RULE),
-        "", "");
-    //bool Contains( const wxPoint2DDouble& c, int fillStyle = wxWINDING_RULE);
+        wxPoint2D , GetCurrentPoint() const,
+        "Gets the last point of the current path, (0,0) if not yet set", "");

 
 

-};

 
 

-//---------------------------------------------------------------------------
+    %nokwargs AddArc;
+    DocStr(AddArc,
+        "Adds an arc of a circle centering at (x,y) with radius (r) from
+startAngle to endAngle", "");
+    virtual void AddArc( wxDouble x, wxDouble y, wxDouble r,
+                         wxDouble startAngle, wxDouble endAngle, bool clockwise );
+    void AddArc( const wxPoint2D& c, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise);

 
 

-class wxGraphicsMatrix : public wxGraphicsObject
-{
-public :
-    // wxGraphicsMatrix(wxGraphicsRenderer* renderer);     *** This class is an ABC

 
 

-    virtual ~wxGraphicsMatrix();
+    DocDeclStr(
+        virtual void , AddQuadCurveToPoint( wxDouble cx, wxDouble cy, wxDouble x, wxDouble y ),
+        "Adds a quadratic Bezier curve from the current point, using a control
+point and an end point", "");

 
 

-    virtual wxGraphicsMatrix *Clone() const;

 
     DocDeclStr(
 
     DocDeclStr(

-        virtual void , Concat( const wxGraphicsMatrix *t ),
-        "concatenates the matrix", "");
+        virtual void , AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h ),
+        "Appends a rectangle as a new closed subpath.", "");

 
 
     DocDeclStr(
 
 
     DocDeclStr(

-        virtual void , Copy( const wxGraphicsMatrix *t ),
-        "copies the passed in matrix", "");
+        virtual void , AddCircle( wxDouble x, wxDouble y, wxDouble r ),
+        "Appends a circle around (x,y) with radius r as a new closed subpath.", "");

 
 
     DocDeclStr(
 
 
     DocDeclStr(

-        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),
-        "sets the matrix to the respective values", "");
+        virtual void , AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r ) ,
+        "Appends 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)", "");

 
 
     DocDeclStr(
 
 
     DocDeclStr(

-        virtual void , Invert(),
-        "makes this the inverse matrix", "");
+        virtual void , AddEllipse( wxDouble x, wxDouble y, wxDouble w, wxDouble h),
+        "Appends an ellipse fitting into the passed in rectangle.", "");

 
 
     DocDeclStr(
 
 
     DocDeclStr(

-        virtual bool , IsEqual( const wxGraphicsMatrix* t) const,
-        "returns true if the elements of the transformation matrix are equal", "");
+        virtual void , AddRoundedRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h, wxDouble radius),
+        "Appends a rounded rectangle.", "");

 
 
     DocDeclStr(
 
 
     DocDeclStr(

-        virtual bool , IsIdentity(),
-        "return true if this is the identity matrix", "");
+        virtual void * , GetNativePath() const,
+        "Returns the native path (CGPathRef for Core Graphics, Path pointer for
+GDIPlus and a cairo_path_t pointer for cairo).  NOTE: For wxPython we
+still need a way to make this value usable.", "");

 
 
     DocDeclStr(
 
 
     DocDeclStr(

-        virtual void , Translate( wxDouble dx , wxDouble dy ),
-        "add the translation to this matrix", "");
+        virtual void , UnGetNativePath(void *p) const,
+        "Gives back the native path returned by GetNativePath() because there
+might be some deallocations necessary (eg on cairo the native path
+returned by GetNativePath is newly allocated each time).", "");

 
 
     DocDeclStr(
 
 
     DocDeclStr(

-        virtual void , Scale( wxDouble xScale , wxDouble yScale ),
-        "add the scale to this matrix", "");
+        virtual void , Transform( const wxGraphicsMatrix& matrix ),
+        "Transforms each point of this path by the matrix", "");

 
 
     DocDeclStr(
 
 
     DocDeclStr(

-        virtual void , Rotate( wxDouble angle ),
-        "add the rotation to this matrix (radians)", "");
+        wxRect2DDouble , GetBox() const,
+        "Gets the bounding box enclosing all points (possibly including control points)", "");

 
 
 
 

-    DocDeclAStr(
-        virtual void , TransformPoint( wxDouble *INOUT, wxDouble *INOUT ),
-        "TransformPoint(self, x, y) --> (x, y)",
-        "applies that matrix to the point", "");
+    %nokwargs Contains;
+    DocStr(Contains,
+        "Returns ``True`` if the point is within the path.", "");
+    virtual bool Contains( wxDouble x, wxDouble y, int fillStyle = wxODDEVEN_RULE) const;
+    bool Contains( const wxPoint2DDouble& c, int fillStyle = wxODDEVEN_RULE) const;

 
 

+};

 
 

-    DocDeclAStr(
-        virtual void , TransformDistance( wxDouble *INOUT, wxDouble *INOUT ),
-        "TransformDistance(self, dx, dy) --> (dx, dy)",
-        "applies the matrix except for translations", "");

 
 

+//---------------------------------------------------------------------------

 
 

-    DocDeclStr(
-        virtual void * , GetNativeMatrix() const,
-        "returns the native representation", "");
-};
+%immutable;
+const wxGraphicsPen     wxNullGraphicsPen;
+const wxGraphicsBrush   wxNullGraphicsBrush;
+const wxGraphicsFont    wxNullGraphicsFont;
+const wxGraphicsMatrix  wxNullGraphicsMatrix;
+const wxGraphicsPath    wxNullGraphicsPath;
+%mutable;

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

+DocStr(wxGraphicsContext,
+"A `wx.GraphicsContext` instance is the object that is drawn upon. It is
+created by a renderer using the CreateContext calls, this can be done
+either directly using a renderer instance, or indirectly using the
+static convenience CreateXXX functions of wx.GraphicsContext that
+always delegate the task to the default renderer.", "");

 
 class wxGraphicsContext : public wxGraphicsObject
 {
 public:
 
 class wxGraphicsContext : public wxGraphicsObject
 {
 public:

-    // wxGraphicsContext()         This is also an ABC, use Create to make an instance...
+    //wxGraphicsContext();         This is an ABC, use Create to make an instance...

     virtual ~wxGraphicsContext();
 
     %newobject Create;
     %nokwargs Create;
     %pythonAppend Create
         "val.__dc = args[0] # save a ref so the dc will not be deleted before self";
     virtual ~wxGraphicsContext();
 
     %newobject Create;
     %nokwargs Create;
     %pythonAppend Create
         "val.__dc = args[0] # save a ref so the dc will not be deleted before self";

+    DocStr(Create,
+           "Creates a wx.GraphicsContext either from a window or a DC.", "");

     static wxGraphicsContext* Create( const wxWindowDC& dc);
     static wxGraphicsContext* Create( const wxWindowDC& dc);

-

     static wxGraphicsContext* Create( wxWindow* window ) ;
 
     static wxGraphicsContext* Create( wxWindow* window ) ;
 

+    

     %newobject CreateFromNative;
     %newobject CreateFromNative;

-    static wxGraphicsContext* CreateFromNative( void * context ) ;
+    DocDeclStr(
+        static wxGraphicsContext* , CreateFromNative( void * context ) ,
+        "Creates a wx.GraphicsContext from a native context. This native context
+must be eg a CGContextRef for Core Graphics, a Graphics pointer for
+GDIPlus or a cairo_t pointer for Cairo.", "");
+    

 
     %newobject CreateFromNative;
 
     %newobject CreateFromNative;

-    static wxGraphicsContext* CreateFromNativeWindow( void * window ) ;
+    DocDeclStr(
+        static wxGraphicsContext* , CreateFromNativeWindow( void * window ) ,
+        "Creates a wx.GraphicsContext from a native window.", "");
+    

 
 
 
 

-    %newobject CreatePath;

     DocDeclStr(
     DocDeclStr(

-        virtual wxGraphicsPath * , CreatePath(),
-        "creates a path instance that corresponds to the type of graphics context, ie GDIPlus, Cairo, CoreGraphics ...", "");
+        virtual wxGraphicsPath , CreatePath(),
+        "Creates a native graphics path which is initially empty.", "");

 
 
 
 

-    %newobject CreatePen;

     DocDeclStr(
     DocDeclStr(

-        virtual wxGraphicsPen* , CreatePen(const wxPen& pen),
-        "", "");
+        virtual wxGraphicsPen , CreatePen(const wxPen& pen),
+        "Creates a native pen from a `wx.Pen`.", "");

 
 
 
 

-    %newobject CreateBrush;

     DocDeclStr(
     DocDeclStr(

-        virtual wxGraphicsBrush* , CreateBrush(const wxBrush& brush ),
-        "", "");
+        virtual wxGraphicsBrush , CreateBrush(const wxBrush& brush ),
+        "Creates a native brush from a `wx.Brush`.", "");

 
 
 
 

-    %newobject CreateLinearGradientBrush;

     DocDeclStr(
     DocDeclStr(

-        virtual wxGraphicsBrush* ,
+        virtual wxGraphicsBrush ,

         CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2,
                                    const wxColour& c1, const wxColour& c2),
         CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2,
                                    const wxColour& c1, const wxColour& c2),

-        "sets the brush to a linear gradient, starting at (x1,y1) with color c1
-to (x2,y2) with color c2", "");
+        "Creates a native brush, having a linear gradient, starting at (x1,y1)
+with color c1 to (x2,y2) with color c2.", "");

 
     
 
     

-    %newobject CreateRadialGradientBrush;

     DocDeclStr(
     DocDeclStr(

-        virtual wxGraphicsBrush* ,
+        virtual wxGraphicsBrush ,

         CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
                                    const wxColour &oColor, const wxColour &cColor),
         CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
                                    const wxColour &oColor, const wxColour &cColor),

-        "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
-", "");
+        "Creates a native brush, having a radial gradient originating at 
+point (xo,yc) with color oColour and ends on a circle around (xc,yc) with
+radius r and color cColour.", "");

 
 
 
 

-    %newobject CreateFont;

     DocDeclStr(
     DocDeclStr(

-        virtual wxGraphicsFont* , CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ),
-        "sets the font", "");
+        virtual wxGraphicsFont , CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ),
+        "Creates a native graphics font from a `wx.Font` and a text colour.", "");

 
 
 
 

-    %newobject CreateMatrix;

     DocDeclStr(
     DocDeclStr(

-        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),
-        "create a 'native' matrix corresponding to these values", "");
+        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),
+        "Creates a native affine transformation matrix from the passed in
+values. The defaults result in an identity matrix.", "");

 
 
 
 
 
 


@@ -633,83 +702,102 @@ cColor
 
     DocDeclStrName(
         virtual void , Clip( const wxRegion &region ),
 
     DocDeclStrName(
         virtual void , Clip( const wxRegion &region ),

-        "clips drawings to the region", "",
+        "Clips drawings to the region, combined to current clipping region.", "",

         ClipRegion);
 
     
     DocDeclStr(
         virtual void , Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h ),
         ClipRegion);
 
     
     DocDeclStr(
         virtual void , Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h ),

-        "clips drawings to the rect", "");
+        "Clips drawings to the rectangle.", "");

 
 
     DocDeclStr(
         virtual void , ResetClip(),
 
 
     DocDeclStr(
         virtual void , ResetClip(),

-        "resets the clipping to original extent", "");
+        "Resets the clipping to original shape.", "");

 
 
     DocDeclStr(
         virtual void * , GetNativeContext(),
 
 
     DocDeclStr(
         virtual void * , GetNativeContext(),

-        "returns the native context", "");
+        "Returns the native context (CGContextRef for Core Graphics, Graphics
+pointer for GDIPlus and cairo_t pointer for cairo).", "");

 
     
     DocDeclStr(
         virtual void , Translate( wxDouble dx , wxDouble dy ),
 
     
     DocDeclStr(
         virtual void , Translate( wxDouble dx , wxDouble dy ),

-        "translate the current transformation matrix CTM of the context", "");
+        "Translates the current transformation matrix.", "");

 
 
     DocDeclStr(
         virtual void , Scale( wxDouble xScale , wxDouble yScale ),
 
 
     DocDeclStr(
         virtual void , Scale( wxDouble xScale , wxDouble yScale ),

-        "scale the current transformation matrix CTM of the context", "");
+        "Scale the current transformation matrix of the context.", "");

 
 
     DocDeclStr(
         virtual void , Rotate( wxDouble angle ),
 
 
     DocDeclStr(
         virtual void , Rotate( wxDouble angle ),

-        "rotate (radians) the current transformation matrix CTM of the context", "");
+        "Rotate the current transformation matrix of the context.  ``angle`` is
+specified in radians.", "");
+

 
 

+    DocDeclStr(
+        virtual void , ConcatTransform( const wxGraphicsMatrix& matrix ),
+        "Concatenates the passed in transform with the current transform of
+this context.", "");
+    
+
+    DocDeclStr(
+        virtual void , SetTransform( const wxGraphicsMatrix& matrix ),
+        "Sets the current transform of this context.", "");
+    
+
+    DocDeclStr(
+        virtual wxGraphicsMatrix , GetTransform() const,
+        "Gets the current transformation matrix of this context.", "");
+    
+    

 
 
 
 

-    DocStr(SetPen, "sets the stroke pen", "");
+    DocStr(SetPen, "Sets the stroke pen", "");

     %nokwargs SetPen;
     %nokwargs SetPen;

-    virtual void SetPen( wxGraphicsPen* pen , bool release = true );
+    virtual void SetPen( const wxGraphicsPen& pen );

     void SetPen( const wxPen& pen );
 
     
     void SetPen( const wxPen& pen );
 
     

-    DocStr(SetBrush, "sets the brush for filling", "");
+    DocStr(SetBrush, "Sets the brush for filling", "");

     %nokwargs SetBrush;
     %nokwargs SetBrush;

-    virtual void SetBrush( wxGraphicsBrush* brush , bool release = true );
+    virtual void SetBrush( const wxGraphicsBrush& brush );

     void SetBrush( const wxBrush& brush );
 
     
     void SetBrush( const wxBrush& brush );
 
     

-    DocStr(SetFont, "sets the font", "");
+    DocStr(SetFont, "Sets the font", "");

     %nokwargs SetFont;
     %nokwargs SetFont;

-    virtual void SetFont( wxGraphicsFont* font, bool release = true );
+    virtual void SetFont( const wxGraphicsFont& font );

     void SetFont( const wxFont& font, const wxColour& colour = *wxBLACK);
 
     
    
     DocDeclStr(
     void SetFont( const wxFont& font, const wxColour& colour = *wxBLACK);
 
     
    
     DocDeclStr(

-        virtual void , StrokePath( const wxGraphicsPath *path ),
-        "strokes along a path with the current pen", "");
+        virtual void , StrokePath( const wxGraphicsPath& path ),
+        "Strokes along a path with the current pen.", "");

 
     
     DocDeclStr(
 
     
     DocDeclStr(

-        virtual void , FillPath( const wxGraphicsPath *path, int fillStyle = wxWINDING_RULE ),
-        "fills a path with the current brush", "");
+        virtual void , FillPath( const wxGraphicsPath& path, int fillStyle = wxODDEVEN_RULE ),
+        "Fills a path with the current brush.", "");

 
    
     DocDeclStr(
 
    
     DocDeclStr(

-        virtual void , DrawPath( const wxGraphicsPath *path, int fillStyle = wxWINDING_RULE ),
-        "draws a path by first filling and then stroking", "");
+        virtual void , DrawPath( const wxGraphicsPath& path, int fillStyle = wxODDEVEN_RULE ),
+        "Draws the path by first filling and then stroking.", "");

 
 
     DocDeclStr(
         virtual void , DrawText( const wxString &str, wxDouble x, wxDouble y ),
 
 
     DocDeclStr(
         virtual void , DrawText( const wxString &str, wxDouble x, wxDouble y ),

-        "", "");
+        "Draws a text at the defined position.", "");

 
 
     DocDeclStrName(
         virtual void , DrawText( const wxString &str, wxDouble x, wxDouble y, wxDouble angle ),
 
 
     DocDeclStrName(
         virtual void , DrawText( const wxString &str, wxDouble x, wxDouble y, wxDouble angle ),

-        "", "",
+        "Draws a text at the defined position, at the given angle.", "",

         DrawRotatedText);
 
 
         DrawRotatedText);
 
 


@@ -720,13 +808,20 @@ cColor
                                       wxDouble *OUTPUT /*descent*/,
                                       wxDouble *OUTPUT /*externalLeading*/ ) const ,
         "GetFullTextExtent(self, text) --> (width, height, descent, externalLeading)",
                                       wxDouble *OUTPUT /*descent*/,
                                       wxDouble *OUTPUT /*externalLeading*/ ) const ,
         "GetFullTextExtent(self, text) --> (width, height, descent, externalLeading)",

-        "", "",
+        "Gets the dimensions of the string using the currently selected
+font. ``text`` is the string to measure, ``w`` and ``h`` are the total
+width and height respectively, ``descent`` is the dimension from the
+baseline of the font to the bottom of the descender, and
+``externalLeading`` is any extra vertical space added to the font by
+the font designer (usually is zero).", "",

         GetFullTextExtent);
 
     %extend {
         DocAStr(GetTextExtent,
                 "GetTextExtent(self, text) --> (width, height)",
         GetFullTextExtent);
 
     %extend {
         DocAStr(GetTextExtent,
                 "GetTextExtent(self, text) --> (width, height)",

-                "", "");
+                "Gets the dimensions of the string using the currently selected
+font. ``text`` is the string to measure, ``w`` and ``h`` are the total
+width and height respectively.", "");

 
         PyObject* GetTextExtent( const wxString &text )
         {
 
         PyObject* GetTextExtent( const wxString &text )
         {


@@ -745,7 +840,8 @@ cColor
     %extend {
         DocAStr(GetPartialTextExtents,
                 "GetPartialTextExtents(self, text) -> [widths]",
     %extend {
         DocAStr(GetPartialTextExtents,
                 "GetPartialTextExtents(self, text) -> [widths]",

-                "", "");
+                "Returns a list of widths from the beginning of ``text`` to the
+coresponding character in ``text``.", "");

         wxArrayDouble GetPartialTextExtents(const wxString& text) {
             wxArrayDouble widths;
             self->GetPartialTextExtents(text, widths);
         wxArrayDouble GetPartialTextExtents(const wxString& text) {
             wxArrayDouble widths;
             self->GetPartialTextExtents(text, widths);


@@ -756,29 +852,30 @@ cColor
 
     DocDeclStr(
         virtual void , DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ),
 
     DocDeclStr(
         virtual void , DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ),

-        "", "");
+        "Draws the bitmap. In case of a mono bitmap, this is treated as a mask
+and the current brush is used for filling.", "");

 
 
     DocDeclStr(
         virtual void , DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h ),
 
 
     DocDeclStr(
         virtual void , DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h ),

-        "", "");
+        "Draws the icon.", "");

 
 
 
     DocDeclStr(
         virtual void , StrokeLine( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2),
 
 
 
     DocDeclStr(
         virtual void , StrokeLine( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2),

-        "strokes a single line", "");
+        "Strokes a single line.", "");

 
     
     DocDeclAStr(
         virtual void , StrokeLines( size_t points, const wxPoint2D *points_array),
         "StrokeLines(self, List points)",
 
     
     DocDeclAStr(
         virtual void , StrokeLines( size_t points, const wxPoint2D *points_array),
         "StrokeLines(self, List points)",

-        "stroke lines connecting each of the points", "");
+        "Stroke lines connecting each of the points", "");

 
 
     %extend {
         DocStr(StrokeLineSegements,
 
 
     %extend {
         DocStr(StrokeLineSegements,

-               "stroke disconnected lines from begin to end points", "");
+               "Stroke disconnected lines from begin to end points", "");

         void StrokeLineSegements(PyObject* beginPoints, PyObject* endPoints)
         {
             size_t c1, c2, count;
         void StrokeLineSegements(PyObject* beginPoints, PyObject* endPoints)
         {
             size_t c1, c2, count;


@@ -797,23 +894,24 @@ cColor
 
 
     DocDeclStr(
 
 
     DocDeclStr(

-        virtual void , DrawLines( size_t points, const wxPoint2D *points_array, int fillStyle = wxWINDING_RULE ),
-        "draws a polygon", "");
+        virtual void , DrawLines( size_t points, const wxPoint2D *points_array,
+                                  int fillStyle = wxODDEVEN_RULE ),
+        "Draws a polygon.", "");

 
 
     DocDeclStr(
         virtual void , DrawRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h),
 
 
     DocDeclStr(
         virtual void , DrawRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h),

-        "draws a rectangle", "");
+        "Draws a rectangle.", "");

 
 
     DocDeclStr(
         virtual void , DrawEllipse( wxDouble x, wxDouble y, wxDouble w, wxDouble h),
 
 
     DocDeclStr(
         virtual void , DrawEllipse( wxDouble x, wxDouble y, wxDouble w, wxDouble h),

-        "draws an ellipse", "");
+        "Draws an ellipse.", "");

 
 
     DocDeclStr(
         virtual void , DrawRoundedRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h, wxDouble radius),
 
 
     DocDeclStr(
         virtual void , DrawRoundedRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h, wxDouble radius),

-        "draws a rounded rectangle", "");
+        "Draws a rounded rectangle", "");

 
     
 
 
     
 


@@ -848,29 +946,22 @@ public :
     virtual wxGraphicsContext * CreateContextFromNativeWindow( void * window );
 
 
     virtual wxGraphicsContext * CreateContextFromNativeWindow( void * window );
 
 

-    %newobject CreatePath;
-    virtual wxGraphicsPath * CreatePath();
+    virtual wxGraphicsPath CreatePath();

 
 

-    %newobject CreateMatrix;
-    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 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);

         
         

-    %newobject CreatePen;
-    virtual wxGraphicsPen* CreatePen(const wxPen& pen) ;
+    virtual wxGraphicsPen CreatePen(const wxPen& pen) ;

     
     

-    %newobject CreateBrush;
-    virtual wxGraphicsBrush* CreateBrush(const wxBrush& brush ) ;
+    virtual wxGraphicsBrush CreateBrush(const wxBrush& brush ) ;

     
     

-    %newobject CreateLinearGradientBrush;
-    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);
 

-    %newobject CreateRadialGradientBrush;
-    virtual wxGraphicsBrush* CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
+    virtual wxGraphicsBrush CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,

                                                         const wxColour &oColor, const wxColour &cColor);
 
                                                         const wxColour &oColor, const wxColour &cColor);
 

-    %newobject CreateFont;
-    virtual wxGraphicsFont* CreateFont( const wxFont &font , const wxColour &col = *wxBLACK );
+    virtual wxGraphicsFont CreateFont( const wxFont &font , const wxColour &col = *wxBLACK );

     
 };
 
     
 };