Apply parts of patch #1719888 to fix compilation on Mac and with

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

diff --git a/wxPython/src/_graphics.i b/wxPython/src/_graphics.i
index 02b406185cae7cba54484e3c0c9214fffd2715f8..8b667a7235aa472943c56314f8df2211e44fd9b4 100644 (file)
--- a/wxPython/src/_graphics.i
+++ b/wxPython/src/_graphics.i
@@ -255,9 +255,8 @@ public:
     virtual void StrokeLines( size_t , const wxPoint2DDouble *, const wxPoint2DDouble *) {}
     virtual void DrawLines( size_t , const wxPoint2DDouble *, int ) {}
     virtual void DrawRectangle( wxDouble , wxDouble , wxDouble , wxDouble ) {}
     virtual void StrokeLines( size_t , const wxPoint2DDouble *, const wxPoint2DDouble *) {}
     virtual void DrawLines( size_t , const wxPoint2DDouble *, int ) {}
     virtual void DrawRectangle( wxDouble , wxDouble , wxDouble , wxDouble ) {}

-    virtual void DrawRoundedRectangle( wxDouble , wxDouble , wxDouble , wxDouble , wxDouble ) {}

     virtual void DrawEllipse( wxDouble , wxDouble , wxDouble , wxDouble ) {}
     virtual void DrawEllipse( wxDouble , wxDouble , wxDouble , wxDouble ) {}

-    virtual void DrawRoundedRectangle( wxDouble  wxDouble , wxDouble , wxDouble , wxDouble ) {}
+    virtual void DrawRoundedRectangle( wxDouble , wxDouble , wxDouble , wxDouble , wxDouble ) {}

     virtual bool ShouldOffset() const { return false; }
 };
 
     virtual bool ShouldOffset() const { return false; }
 };
 


@@ -423,27 +422,19 @@ public :
 
 DocStr(wxGraphicsMatrix,
 "A wx.GraphicsMatrix is a native representation of an affine
 
 DocStr(wxGraphicsMatrix,
 "A wx.GraphicsMatrix is a native representation of an affine

-matrix. The contents are specific an private to the respective
+matrix. The contents are specific and 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 :
 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 :

-    wxGraphicsMatrix(); 
+//    wxGraphicsMatrix(); 

     virtual ~wxGraphicsMatrix();
 
     DocDeclStr(
         virtual void , Concat( const wxGraphicsMatrix& t ),
         "Concatenates the passed in matrix to the current matrix.", "");
 
     virtual ~wxGraphicsMatrix();
 
     DocDeclStr(
         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(
         virtual void , Set(wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0,
 
     DocDeclStr(
         virtual void , Set(wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0,


@@ -466,7 +457,8 @@ identity matrix.)", "");
 
     DocDeclStr(
         virtual bool , IsEqual( const wxGraphicsMatrix& t) const,
 
     DocDeclStr(
         virtual bool , IsEqual( const wxGraphicsMatrix& t) const,

-        "Returns ``True`` if the elements of the transformation matrix are equal", "");
+        "Returns ``True`` if the elements of the transformation matrix are
+equal", "");

 
 
     DocDeclStr(
 
 
     DocDeclStr(


@@ -515,7 +507,7 @@ way to make this value usable.", "");
 class wxGraphicsPath : public wxGraphicsObject
 {
 public :
 class wxGraphicsPath : public wxGraphicsObject
 {
 public :

-    wxGraphicsPath();
+//    wxGraphicsPath();

     virtual ~wxGraphicsPath();
 
 
     virtual ~wxGraphicsPath();
 
 


@@ -564,8 +556,8 @@ points and an end point", "");
         "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,
         "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);
+                         wxDouble startAngle, wxDouble endAngle, bool clockwise=true );
+    void AddArc( const wxPoint2D& c, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise=true);

 
 
     DocDeclStr(
 
 
     DocDeclStr(


@@ -586,8 +578,8 @@ point and an end point", "");
 
     DocDeclStr(
         virtual void , AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r ) ,
 
     DocDeclStr(
         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)", "");
+        "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(


@@ -621,7 +613,8 @@ returned by GetNativePath is newly allocated each time).", "");
 
     DocDeclStr(
         wxRect2D , GetBox() const,
 
     DocDeclStr(
         wxRect2D , GetBox() const,

-        "Gets the bounding box enclosing all points (possibly including control points)", "");
+        "Gets the bounding box enclosing all points (possibly including control
+points)", "");

 
 
     %nokwargs Contains;
 
 
     %nokwargs Contains;


@@ -675,15 +668,17 @@ public:
     %newobject CreateFromNative;
     DocDeclStr(
         static wxGraphicsContext* , CreateFromNative( void * context ) ,
     %newobject CreateFromNative;
     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.", "");
+        "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.  NOTE: For
+wxPython we still need a way to make this value usable.", "");

     
 
     %newobject CreateFromNative;
     DocDeclStr(
         static wxGraphicsContext* , CreateFromNativeWindow( void * window ) ,
     
 
     %newobject CreateFromNative;
     DocDeclStr(
         static wxGraphicsContext* , CreateFromNativeWindow( void * window ) ,

-        "Creates a wx.GraphicsContext from a native window.", "");
+        "Creates a wx.GraphicsContext from a native window.  NOTE: For wxPython
+we still need a way to make this value usable.", "");

     
 
 
     
 
 


@@ -714,8 +709,8 @@ with color c1 to (x2,y2) with color c2.", "");
         virtual wxGraphicsBrush ,
         CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
                                    const wxColour &oColor, const wxColour &cColor),
         virtual wxGraphicsBrush ,
         CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
                                    const wxColour &oColor, const wxColour &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
+        "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.", "");
 
 
 radius r and color cColour.", "");
 
 


@@ -735,12 +730,13 @@ values. The defaults result in an identity matrix.", "");
 
     DocDeclStr(
         virtual void , PushState(),
 
     DocDeclStr(
         virtual void , PushState(),

-        "push the current state of the context, ie the transformation matrix on a stack", "");
+        "Push the current state of the context, (ie the transformation matrix)
+on a stack", "");

 
 
     DocDeclStr(
         virtual void , PopState(),
 
 
     DocDeclStr(
         virtual void , PopState(),

-        "pops a stored state from the stack", "");
+        "Pops a stored state from the stack", "");

 
 
     DocDeclStrName(
 
 
     DocDeclStrName(


@@ -805,8 +801,7 @@ this context.", "");
     DocDeclStr(
         virtual wxGraphicsMatrix , GetTransform() const,
         "Gets the current transformation matrix 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", "");


@@ -943,8 +938,9 @@ and the current brush is used for filling.", "");
 
 
     %extend {
 
 
     %extend {

-        DocStr(StrokeLineSegements,
-               "Stroke disconnected lines from begin to end points", "");
+        DocAStr(StrokeLineSegements,
+                "StrokeLineSegments(self, List beginPoints, List endPoints)",
+                "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;