fix wrong parenthesizing of boolean expressions

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

diff --git a/wxPython/src/_graphics.i b/wxPython/src/_graphics.i
index b2fd3aa94ec8fb399264692ea5ab03220bd127ee..02b406185cae7cba54484e3c0c9214fffd2715f8 100644 (file)
--- a/wxPython/src/_graphics.i
+++ b/wxPython/src/_graphics.i
@@ -138,6 +138,8 @@ public :
     virtual void Copy( const wxGraphicsMatrix & )  {}
     virtual void Set(wxDouble , wxDouble , wxDouble , wxDouble ,
                      wxDouble , wxDouble ) {}
+    virtual void Get(wxDouble*, wxDouble*, wxDouble*,
+                     wxDouble*, wxDouble*, wxDouble*) {}
     virtual void Invert() {}
     virtual bool IsEqual( const wxGraphicsMatrix& t) const  { return false; }
     virtual bool IsIdentity() const { return false; }
@@ -215,6 +217,8 @@ public:
     virtual void Clip( wxDouble , wxDouble , wxDouble , wxDouble  ) {}
     virtual void ResetClip() {}
     virtual void * GetNativeContext() { return NULL; }
+    virtual int GetLogicalFunction() const { return 0; }
+    virtual bool SetLogicalFunction(int ) {}    
     virtual void Translate( wxDouble , wxDouble ) {}
     virtual void Scale( wxDouble , wxDouble ) {}
     virtual void Rotate( wxDouble ) {}
@@ -447,6 +451,13 @@ public :
         "Sets the matrix to the specified values (default values are the
 identity matrix.)", "");
 
+    
+    DocDeclAStr(
+        virtual void , Get(wxDouble* OUTPUT, wxDouble* OUTPUT, wxDouble* OUTPUT,
+                           wxDouble* OUTPUT, wxDouble* OUTPUT, wxDouble* OUTPUT),
+        "Get(self) --> (a, b, c, d, tx, ty)",
+        "Gets the component values of the matrix and returns them as a tuple.", "");
+    
 
     DocDeclStr(
         virtual void , Invert(),
@@ -609,7 +620,7 @@ returned by GetNativePath is newly allocated each time).", "");
 
 
     DocDeclStr(
-        wxRect2DDouble , GetBox() const,
+        wxRect2D , GetBox() const,
         "Gets the bounding box enclosing all points (possibly including control points)", "");
 
 
@@ -617,7 +628,7 @@ returned by GetNativePath is newly allocated each time).", "");
     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;
+    bool Contains( const wxPoint2D& c, int fillStyle = wxODDEVEN_RULE) const;
 
 };
 
@@ -754,6 +765,16 @@ values. The defaults result in an identity matrix.", "");
 pointer for GDIPlus and cairo_t pointer for cairo).", "");
 
     
+    DocDeclStr(
+        virtual int , GetLogicalFunction() const,
+        "Returns the current logical function.", "");
+    
+    
+    DocDeclStr(
+        virtual bool , SetLogicalFunction(int function) ,
+        "Sets the current logical function, returns ``True`` if it supported", "");
+       
+    
     DocDeclStr(
         virtual void , Translate( wxDouble dx , wxDouble dy ),
         "Translates the current transformation matrix.", "");