reSWIGged

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

diff --git a/wxPython/src/_gdicmn.i b/wxPython/src/_gdicmn.i
index 10e869f0381d2cb213d4fb62c4918e51368c0bf6..37fd6107d0be867ad0c00ebdaf9768288be95c00 100644 (file)
--- a/wxPython/src/_gdicmn.i
+++ b/wxPython/src/_gdicmn.i
@@ -112,10 +112,10 @@ enum wxStockCursor
 %newgroup
 
 DocStr( wxSize,
 %newgroup
 
 DocStr( wxSize,

-"wx.Size is a useful data structure used to represent the size of something.
-It simply contians integer width and height proprtites.  In most places in
-wxPython where a wx.Size is expected a (width,height) tuple can be used
-instead.");
+"wx.Size is a useful data structure used to represent the size of
+something.  It simply contians integer width and height proprtites.
+In most places in wxPython where a wx.Size is expected a
+(width,height) tuple can be used instead.", "");

 
 class wxSize
 {
 
 class wxSize
 {


@@ -126,63 +126,81 @@ public:
     
     DocCtorStr(
         wxSize(int w=0, int h=0),
     
     DocCtorStr(
         wxSize(int w=0, int h=0),

-        "Creates a size object.");
+        "Creates a size object.", "");

 
     ~wxSize();
 
 
     ~wxSize();
 

+// None/NULL is now handled properly by the typemap, so these are not needed.
+//     %extend {
+//         bool __eq__(const wxSize* other) { return other ? (*self == *other) : false; }
+//         bool __ne__(const wxSize* other) { return other ? (*self != *other) : true;  }
+//     }
+

     DocDeclStr(
         bool, operator==(const wxSize& sz),
     DocDeclStr(
         bool, operator==(const wxSize& sz),

-        "Test for equality of wx.Size objects.");
+        "Test for equality of wx.Size objects.", "");

 
     DocDeclStr(
         bool, operator!=(const wxSize& sz),
 
     DocDeclStr(
         bool, operator!=(const wxSize& sz),

-        "Test for inequality.");
+        "Test for inequality.", "");

 
     DocDeclStr(
         wxSize, operator+(const wxSize& sz),
 
     DocDeclStr(
         wxSize, operator+(const wxSize& sz),

-        "Add sz's proprties to this and return the result.");
+        "Add sz's proprties to this and return the result.", "");

 
     DocDeclStr(
         wxSize, operator-(const wxSize& sz),
 
     DocDeclStr(
         wxSize, operator-(const wxSize& sz),

-        "Subtract sz's properties from this and return the result.");
+        "Subtract sz's properties from this and return the result.", "");

 
     DocDeclStr(
         void, IncTo(const wxSize& sz),
 
     DocDeclStr(
         void, IncTo(const wxSize& sz),

-        "Increments this object so that both of its dimensions are not less\n"
-        "than the corresponding dimensions of the size.");
+        "Increments this object so that both of its dimensions are not less
+than the corresponding dimensions of the size.", "");

 
     DocDeclStr(
         void, DecTo(const wxSize& sz),
 
     DocDeclStr(
         void, DecTo(const wxSize& sz),

-        "Decrements this object so that both of its dimensions are not greater\n"
-        "than the corresponding dimensions of the size.");
+        "Decrements this object so that both of its dimensions are not greater
+than the corresponding dimensions of the size.", "");

 
     DocDeclStr(
         void, Set(int w, int h),
 
     DocDeclStr(
         void, Set(int w, int h),

-        "Set both width and height.");
+        "Set both width and height.", "");

     
     void SetWidth(int w);
     void SetHeight(int h);
     int GetWidth() const;
     int GetHeight() const;
 
     
     void SetWidth(int w);
     void SetHeight(int h);
     int GetWidth() const;
     int GetHeight() const;
 

+    
+    DocDeclStr(
+        bool , IsFullySpecified() const,
+        "Returns True if both components of the size are non-default values.", "");
+    
+
+    DocDeclStr(
+        void , SetDefaults(const wxSize& size),
+        "Combine this size with the other one replacing the default components
+of this object (i.e. equal to -1) with those of the other.", "");
+    
+   

     //int GetX() const;
     //int GetY() const;
 
     %extend {
         DocAStr(Get,
                "Get() -> (width,height)",
     //int GetX() const;
     //int GetY() const;
 
     %extend {
         DocAStr(Get,
                "Get() -> (width,height)",

-               "Returns the width and height properties as a tuple.");
+               "Returns the width and height properties as a tuple.", "");

         PyObject* Get() {
         PyObject* Get() {

-            wxPyBeginBlockThreads();
+            bool blocked = wxPyBeginBlockThreads();

             PyObject* tup = PyTuple_New(2);
             PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x));
             PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y));
             PyObject* tup = PyTuple_New(2);
             PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x));
             PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y));

-            wxPyEndBlockThreads();
+            wxPyEndBlockThreads(blocked);

             return tup;
         }
     }
     %pythoncode {
             return tup;
         }
     }
     %pythoncode {

-    asTuple = Get
+    asTuple = wx._deprecated(Get, "asTuple is deprecated, use `Get` instead")

     def __str__(self):                   return str(self.Get())
     def __repr__(self):                  return 'wx.Size'+str(self.Get())
     def __len__(self):                   return len(self.Get())
     def __str__(self):                   return str(self.Get())
     def __repr__(self):                  return 'wx.Size'+str(self.Get())
     def __len__(self):                   return len(self.Get())


@@ -192,9 +210,8 @@ public:
         elif index == 1: self.height = val
         else: raise IndexError
     def __nonzero__(self):               return self.Get() != (0,0)
         elif index == 1: self.height = val
         else: raise IndexError
     def __nonzero__(self):               return self.Get() != (0,0)

-    def __getinitargs__(self):           return ()
-    def __getstate__(self):              return self.Get()
-    def __setstate__(self, state):       self.Set(*state)
+    __safe_for_unpickling__ = True
+    def __reduce__(self):                return (wx.Size, self.Get())

     }
 
 };
     }
 
 };


@@ -203,9 +220,9 @@ public:
 %newgroup
 
 DocStr( wxRealPoint,
 %newgroup
 
 DocStr( wxRealPoint,

-"A data structure for representing a point or position with floating point x
-and y properties.  In wxPython most places that expect a wx.RealPoint can also
-accept a (x,y) tuple.");
+"A data structure for representing a point or position with floating
+point x and y properties.  In wxPython most places that expect a
+wx.RealPoint can also accept a (x,y) tuple.", "");

 class wxRealPoint
 {
 public:
 class wxRealPoint
 {
 public:


@@ -214,30 +231,30 @@ public:
 
     DocCtorStr(
         wxRealPoint(double x=0.0, double y=0.0),
 
     DocCtorStr(
         wxRealPoint(double x=0.0, double y=0.0),

-        "Create a wx.RealPoint object");
+        "Create a wx.RealPoint object", "");

     
     ~wxRealPoint();
 
     DocDeclStr(
         bool, operator==(const wxRealPoint& pt),
     
     ~wxRealPoint();
 
     DocDeclStr(
         bool, operator==(const wxRealPoint& pt),

-        "Test for equality of wx.RealPoint objects.");
+        "Test for equality of wx.RealPoint objects.", "");

 
     DocDeclStr(
         bool, operator!=(const wxRealPoint& pt),
 
     DocDeclStr(
         bool, operator!=(const wxRealPoint& pt),

-        "Test for inequality of wx.RealPoint objects.");
+        "Test for inequality of wx.RealPoint objects.", "");

 
     
     DocDeclStr(
         wxRealPoint, operator+(const wxRealPoint& pt),
 
     
     DocDeclStr(
         wxRealPoint, operator+(const wxRealPoint& pt),

-        "Add pt's proprties to this and return the result.");
+        "Add pt's proprties to this and return the result.", "");

 
     DocDeclStr(
         wxRealPoint, operator-(const wxRealPoint& pt),
 
     DocDeclStr(
         wxRealPoint, operator-(const wxRealPoint& pt),

-        "Subtract pt's proprties from this and return the result");
+        "Subtract pt's proprties from this and return the result", "");

 
 
     %extend {
 
 
     %extend {

-        DocStr(Set, "Set both the x and y properties");
+        DocStr(Set, "Set both the x and y properties", "");

         void Set(double x, double y) {
             self->x = x;
             self->y = y;
         void Set(double x, double y) {
             self->x = x;
             self->y = y;


@@ -245,19 +262,19 @@ public:
 
         DocAStr(Get,
                "Get() -> (x,y)",
 
         DocAStr(Get,
                "Get() -> (x,y)",

-               "Return the x and y properties as a tuple. ");
+               "Return the x and y properties as a tuple. ", "");

         PyObject* Get() {
         PyObject* Get() {

-            wxPyBeginBlockThreads();
+            bool blocked = wxPyBeginBlockThreads();

             PyObject* tup = PyTuple_New(2);
             PyTuple_SET_ITEM(tup, 0, PyFloat_FromDouble(self->x));
             PyTuple_SET_ITEM(tup, 1, PyFloat_FromDouble(self->y));
             PyObject* tup = PyTuple_New(2);
             PyTuple_SET_ITEM(tup, 0, PyFloat_FromDouble(self->x));
             PyTuple_SET_ITEM(tup, 1, PyFloat_FromDouble(self->y));

-            wxPyEndBlockThreads();
+            wxPyEndBlockThreads(blocked);

             return tup;
         }
     }
 
     %pythoncode {
             return tup;
         }
     }
 
     %pythoncode {

-    asTuple = Get
+    asTuple = wx._deprecated(Get, "asTuple is deprecated, use `Get` instead")

     def __str__(self):                   return str(self.Get())
     def __repr__(self):                  return 'wx.RealPoint'+str(self.Get())
     def __len__(self):                   return len(self.Get())
     def __str__(self):                   return str(self.Get())
     def __repr__(self):                  return 'wx.RealPoint'+str(self.Get())
     def __len__(self):                   return len(self.Get())


@@ -267,9 +284,8 @@ public:
         elif index == 1: self.y = val
         else: raise IndexError
     def __nonzero__(self):               return self.Get() != (0.0, 0.0)
         elif index == 1: self.y = val
         else: raise IndexError
     def __nonzero__(self):               return self.Get() != (0.0, 0.0)

-    def __getinitargs__(self):           return ()
-    def __getstate__(self):              return self.Get()
-    def __setstate__(self, state):       self.Set(*state)
+    __safe_for_unpickling__ = True
+    def __reduce__(self):                return (wx.RealPoint, self.Get())

     }
 };
 
     }
 };
 


@@ -279,9 +295,9 @@ public:
 
 
 DocStr(wxPoint,
 
 
 DocStr(wxPoint,

-"A data structure for representing a point or position with integer x and y
-properties.  Most places in wxPython that expect a wx.Point can also accept a
-(x,y) tuple.");
+"A data structure for representing a point or position with integer x
+and y properties.  Most places in wxPython that expect a wx.Point can
+also accept a (x,y) tuple.", "");

 
 class wxPoint
 {
 
 class wxPoint
 {


@@ -290,40 +306,68 @@ public:
 
     DocCtorStr(
         wxPoint(int x=0, int y=0),
 
     DocCtorStr(
         wxPoint(int x=0, int y=0),

-        "Create a wx.Point object");
+        "Create a wx.Point object", "");

 
     ~wxPoint();
 
     
     DocDeclStr(
         bool, operator==(const wxPoint& pt),
 
     ~wxPoint();
 
     
     DocDeclStr(
         bool, operator==(const wxPoint& pt),

-        "Test for equality of wx.Point objects.");
+        "Test for equality of wx.Point objects.", "");

 
     DocDeclStr(
         bool, operator!=(const wxPoint& pt),
 
     DocDeclStr(
         bool, operator!=(const wxPoint& pt),

-        "Test for inequality of wx.Point objects.");
+        "Test for inequality of wx.Point objects.", "");
+
+

 
 

+//     %nokwargs operator+;
+//     %nokwargs operator-;
+//     %nokwargs operator+=;
+//     %nokwargs operator-=;

     
     DocDeclStr(
         wxPoint, operator+(const wxPoint& pt),
     
     DocDeclStr(
         wxPoint, operator+(const wxPoint& pt),

-        "Add pt's proprties to this and return the result.");
+        "Add pt's proprties to this and return the result.", "");

 
 

+   

     DocDeclStr(
         wxPoint, operator-(const wxPoint& pt),
     DocDeclStr(
         wxPoint, operator-(const wxPoint& pt),

-        "Subtract pt's proprties from this and return the result");
+        "Subtract pt's proprties from this and return the result", "");

 
 
     DocDeclStr(
         wxPoint&, operator+=(const wxPoint& pt),
 
 
     DocDeclStr(
         wxPoint&, operator+=(const wxPoint& pt),

-        "Add pt to this object.");
+        "Add pt to this object.", "");

 
     DocDeclStr(
         wxPoint&, operator-=(const wxPoint& pt),
 
     DocDeclStr(
         wxPoint&, operator-=(const wxPoint& pt),

-        "Subtract pt from this object.");
+        "Subtract pt from this object.", "");
+
+
+    
+//     DocDeclStr(
+//         wxPoint, operator+(const wxSize& sz),
+//         "Add sz to this Point and return the result.", "");

 
 

+//     DocDeclStr(
+//         wxPoint, operator-(const wxSize& sz),
+//         "Subtract sz from this Point and return the result", "");
+
+
+//     DocDeclStr(
+//         wxPoint&, operator+=(const wxSize& sz),
+//         "Add sz to this object.", "");
+
+//     DocDeclStr(
+//         wxPoint&, operator-=(const wxSize& sz),
+//         "Subtract sz from this object.", "");
+
+
+    

     
     %extend {
     
     %extend {

-        DocStr(Set, "Set both the x and y properties");
+        DocStr(Set, "Set both the x and y properties", "");

         void Set(long x, long y) {
             self->x = x;
             self->y = y;
         void Set(long x, long y) {
             self->x = x;
             self->y = y;


@@ -331,19 +375,19 @@ public:
 
         DocAStr(Get,
                "Get() -> (x,y)",
 
         DocAStr(Get,
                "Get() -> (x,y)",

-               "Return the x and y properties as a tuple. ");
+               "Return the x and y properties as a tuple. ", "");

         PyObject* Get() {
         PyObject* Get() {

-            wxPyBeginBlockThreads();
+            bool blocked = wxPyBeginBlockThreads();

             PyObject* tup = PyTuple_New(2);
             PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x));
             PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y));
             PyObject* tup = PyTuple_New(2);
             PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x));
             PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y));

-            wxPyEndBlockThreads();
+            wxPyEndBlockThreads(blocked);

             return tup;
         }
     }
 
     %pythoncode {
             return tup;
         }
     }
 
     %pythoncode {

-    asTuple = Get
+    asTuple = wx._deprecated(Get, "asTuple is deprecated, use `Get` instead")

     def __str__(self):                   return str(self.Get())
     def __repr__(self):                  return 'wx.Point'+str(self.Get())
     def __len__(self):                   return len(self.Get())
     def __str__(self):                   return str(self.Get())
     def __repr__(self):                  return 'wx.Point'+str(self.Get())
     def __len__(self):                   return len(self.Get())


@@ -353,9 +397,8 @@ public:
         elif index == 1: self.y = val
         else: raise IndexError
     def __nonzero__(self):               return self.Get() != (0,0)
         elif index == 1: self.y = val
         else: raise IndexError
     def __nonzero__(self):               return self.Get() != (0,0)

-    def __getinitargs__(self):           return ()
-    def __getstate__(self):              return self.Get()
-    def __setstate__(self, state):       self.Set(*state)
+    __safe_for_unpickling__ = True
+    def __reduce__(self):                return (wx.Point, self.Get())

     }
 };
 
     }
 };
 


@@ -364,27 +407,32 @@ public:
 
 
 DocStr(wxRect,
 
 
 DocStr(wxRect,

-"A class for representing and manipulating rectangles.  It has x, y, width and
-height properties.  In wxPython most palces that expect a wx.Rect can also
-accept a (x,y,width,height) tuple.");
+"A class for representing and manipulating rectangles.  It has x, y,
+width and height properties.  In wxPython most palces that expect a
+wx.Rect can also accept a (x,y,width,height) tuple.", "");

 
 class wxRect
 {
 public:
     DocCtorStr(
         wxRect(int x=0, int y=0, int width=0, int height=0),
 
 class wxRect
 {
 public:
     DocCtorStr(
         wxRect(int x=0, int y=0, int width=0, int height=0),

-        "Create a new Rect object.");          
+        "Create a new Rect object.", "");          

 
     DocCtorStrName(
         wxRect(const wxPoint& topLeft, const wxPoint& bottomRight),
 
     DocCtorStrName(
         wxRect(const wxPoint& topLeft, const wxPoint& bottomRight),

-        "Create a new Rect object from Points representing two corners.",
+        "Create a new Rect object from Points representing two corners.", "",

         RectPP);
 
     DocCtorStrName(
         wxRect(const wxPoint& pos, const wxSize& size),
         RectPP);
 
     DocCtorStrName(
         wxRect(const wxPoint& pos, const wxSize& size),

-        "Create a new Rect from a position and size.",
+        "Create a new Rect from a position and size.", "",

          RectPS);
          RectPS);

-    
+
+    DocCtorStrName(
+        wxRect(const wxSize& size),
+        "Create a new Rect from a size only.", "",
+         RectS);
+

     ~wxRect();
 
     int GetX() const;
     ~wxRect();
 
     int GetX() const;


@@ -436,61 +484,62 @@ public:
 
     DocDeclStr(
         wxRect&, Inflate(wxCoord dx, wxCoord dy),
 
     DocDeclStr(
         wxRect&, Inflate(wxCoord dx, wxCoord dy),

-        "Increase the rectangle size by dx in x direction and dy in y direction. Both\n"
-        "(or one of) parameters may be negative to decrease the rectangle size.");
+        "Increase the rectangle size by dx in x direction and dy in y
+direction. Both or one of) parameters may be negative to decrease the
+rectangle size.", "");

 
     DocDeclStr(
         wxRect&, Deflate(wxCoord dx, wxCoord dy),
 
     DocDeclStr(
         wxRect&, Deflate(wxCoord dx, wxCoord dy),

-        "Decrease the rectangle size by dx in x direction and dy in y direction. Both\n"
-        "(or one of) parameters may be negative to increase the rectngle size. This\n"
-        "method is the opposite of Inflate.");
+        "Decrease the rectangle size by dx in x direction and dy in y
+direction. Both or one of) parameters may be negative to increase the
+rectngle size. This method is the opposite of Inflate.", "");

 
     DocDeclStrName(
         void, Offset(wxCoord dx, wxCoord dy),
 
     DocDeclStrName(
         void, Offset(wxCoord dx, wxCoord dy),

-        "Moves the rectangle by the specified offset. If dx is positive, the rectangle\n"
-        "is moved to the right, if dy is positive, it is moved to the bottom, otherwise\n"
-        "it is moved to the left or top respectively.",
+        "Moves the rectangle by the specified offset. If dx is positive, the
+rectangle is moved to the right, if dy is positive, it is moved to the
+bottom, otherwise it is moved to the left or top respectively.", "",

         OffsetXY);
     
     DocDeclStr(
         void, Offset(const wxPoint& pt),
         OffsetXY);
     
     DocDeclStr(
         void, Offset(const wxPoint& pt),

-        "Same as OffsetXY but uses dx,dy from Point");
+        "Same as OffsetXY but uses dx,dy from Point", "");

 
     DocDeclStr(
         wxRect&, Intersect(const wxRect& rect),
 
     DocDeclStr(
         wxRect&, Intersect(const wxRect& rect),

-        "Return the intersectsion of this rectangle and rect.");
+        "Return the intersectsion of this rectangle and rect.", "");

 
     DocDeclStr(
         wxRect, operator+(const wxRect& rect) const,
 
     DocDeclStr(
         wxRect, operator+(const wxRect& rect) const,

-        "Add the properties of rect to this rectangle and return the result.");
+        "Add the properties of rect to this rectangle and return the result.", "");

 
     DocDeclStr(
         wxRect&, operator+=(const wxRect& rect),
 
     DocDeclStr(
         wxRect&, operator+=(const wxRect& rect),

-        "Add the properties of rect to this rectangle, updating this rectangle.");
+        "Add the properties of rect to this rectangle, updating this rectangle.", "");

 
     DocDeclStr(
         bool, operator==(const wxRect& rect) const,
 
     DocDeclStr(
         bool, operator==(const wxRect& rect) const,

-        "Test for equality.");
+        "Test for equality.", "");

 
     DocDeclStr(
         bool, operator!=(const wxRect& rect) const,
 
     DocDeclStr(
         bool, operator!=(const wxRect& rect) const,

-        "Test for inequality.");
+        "Test for inequality.", "");

 
     
 
     

-    DocStr( Inside, "Return True if the point is (not strcitly) inside the rect.");
+    DocStr( Inside, "Return True if the point is (not strcitly) inside the rect.", "");

     %name(InsideXY)bool Inside(int x, int y) const;
     bool Inside(const wxPoint& pt) const;
 
     DocDeclStr(    
         bool, Intersects(const wxRect& rect) const,
     %name(InsideXY)bool Inside(int x, int y) const;
     bool Inside(const wxPoint& pt) const;
 
     DocDeclStr(    
         bool, Intersects(const wxRect& rect) const,

-        "Returns True if the rectangles have a non empty intersection.");
+        "Returns True if the rectangles have a non empty intersection.", "");

 
     
     int x, y, width, height;
 
 
     %extend {
 
     
     int x, y, width, height;
 
 
     %extend {

-       DocStr(Set, "Set all rectangle properties.");
+       DocStr(Set, "Set all rectangle properties.", "");

         void Set(int x=0, int y=0, int width=0, int height=0) {
             self->x = x;
             self->y = y;
         void Set(int x=0, int y=0, int width=0, int height=0) {
             self->x = x;
             self->y = y;


@@ -500,21 +549,21 @@ public:
 
         DocAStr(Get,
                "Get() -> (x,y,width,height)",
 
         DocAStr(Get,
                "Get() -> (x,y,width,height)",

-               "Return the rectangle properties as a tuple.");
+               "Return the rectangle properties as a tuple.", "");

         PyObject* Get() {
         PyObject* Get() {

-            wxPyBeginBlockThreads();
+            bool blocked = wxPyBeginBlockThreads();

             PyObject* tup = PyTuple_New(4);
             PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x));
             PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y));
             PyTuple_SET_ITEM(tup, 2, PyInt_FromLong(self->width));
             PyTuple_SET_ITEM(tup, 3, PyInt_FromLong(self->height));
             PyObject* tup = PyTuple_New(4);
             PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x));
             PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y));
             PyTuple_SET_ITEM(tup, 2, PyInt_FromLong(self->width));
             PyTuple_SET_ITEM(tup, 3, PyInt_FromLong(self->height));

-            wxPyEndBlockThreads();
+            wxPyEndBlockThreads(blocked);

             return tup;
         }
     }
 
     %pythoncode {
             return tup;
         }
     }
 
     %pythoncode {

-    asTuple = Get
+    asTuple = wx._deprecated(Get, "asTuple is deprecated, use `Get` instead")

     def __str__(self):                   return str(self.Get())
     def __repr__(self):                  return 'wx.Rect'+str(self.Get())
     def __len__(self):                   return len(self.Get())
     def __str__(self):                   return str(self.Get())
     def __repr__(self):                  return 'wx.Rect'+str(self.Get())
     def __len__(self):                   return len(self.Get())


@@ -526,16 +575,17 @@ public:
         elif index == 3: self.height = val
         else: raise IndexError
     def __nonzero__(self):               return self.Get() != (0,0,0,0)
         elif index == 3: self.height = val
         else: raise IndexError
     def __nonzero__(self):               return self.Get() != (0,0,0,0)

-    def __getinitargs__(self):           return ()
-    def __getstate__(self):              return self.Get()
-    def __setstate__(self, state):       self.Set(*state)
+    __safe_for_unpickling__ = True
+    def __reduce__(self):                return (wx.Rect, self.Get())

     }
 };
 
 
     }
 };
 
 

+MustHaveApp(wxIntersectRect);
+

 DocAStr(wxIntersectRect,
        "IntersectRect(Rect r1, Rect r2) -> Rect",
 DocAStr(wxIntersectRect,
        "IntersectRect(Rect r1, Rect r2) -> Rect",

-       "Calculate and return the intersection of r1 and r2.");
+       "Calculate and return the intersection of r1 and r2.", "");

 %inline %{
     PyObject* wxIntersectRect(wxRect* r1, wxRect* r2) {
         wxRegion  reg1(*r1);
 %inline %{
     PyObject* wxIntersectRect(wxRect* r1, wxRect* r2) {
         wxRegion  reg1(*r1);


@@ -547,10 +597,10 @@ DocAStr(wxIntersectRect,
         dest = reg1.GetBox();
 
         if (dest != wxRect(0,0,0,0)) {
         dest = reg1.GetBox();
 
         if (dest != wxRect(0,0,0,0)) {

-            wxPyBeginBlockThreads();
+            bool blocked = wxPyBeginBlockThreads();

             wxRect* newRect = new wxRect(dest);
             wxRect* newRect = new wxRect(dest);

-            obj = wxPyConstructObject((void*)newRect, wxT("wxRect"), True);
-            wxPyEndBlockThreads();
+            obj = wxPyConstructObject((void*)newRect, wxT("wxRect"), true);
+            wxPyEndBlockThreads(blocked);

             return obj;
         }
         Py_INCREF(Py_None);
             return obj;
         }
         Py_INCREF(Py_None);


@@ -563,12 +613,13 @@ DocAStr(wxIntersectRect,
 
 
 DocStr(wxPoint2D,
 
 
 DocStr(wxPoint2D,

-      "wx.Point2Ds represent a point or a vector in a 2d coordinate system with floating point values.");
+      "wx.Point2Ds represent a point or a vector in a 2d coordinate system
+with floating point values.", "");

 
 class wxPoint2D
 {
 public:
 
 class wxPoint2D
 {
 public:

-    DocStr(wxPoint2D, "Create a w.Point2D object.");
+    DocStr(wxPoint2D, "Create a w.Point2D object.", "");

     wxPoint2D( double x=0.0 , double y=0.0 );
     %name(Point2DCopy) wxPoint2D( const wxPoint2D &pt );
     %name(Point2DFromPoint) wxPoint2D( const wxPoint &pt );
     wxPoint2D( double x=0.0 , double y=0.0 );
     %name(Point2DCopy) wxPoint2D( const wxPoint2D &pt );
     %name(Point2DFromPoint) wxPoint2D( const wxPoint &pt );


@@ -576,12 +627,12 @@ public:
     DocDeclAStr(
         void, GetFloor( int *OUTPUT , int *OUTPUT ) const,
         "GetFloor() -> (x,y)",
     DocDeclAStr(
         void, GetFloor( int *OUTPUT , int *OUTPUT ) const,
         "GetFloor() -> (x,y)",

-        "Convert to integer");
+        "Convert to integer", "");

     
     DocDeclAStr(
         void, GetRounded( int *OUTPUT , int *OUTPUT ) const,
         "GetRounded() -> (x,y)",
     
     DocDeclAStr(
         void, GetRounded( int *OUTPUT , int *OUTPUT ) const,
         "GetRounded() -> (x,y)",

-        "Convert to integer");
+        "Convert to integer", "");

 
     double GetVectorLength() const;
     double GetVectorAngle() const ;
 
     double GetVectorLength() const;
     double GetVectorAngle() const ;


@@ -605,7 +656,7 @@ public:
 
     DocDeclStr(
         wxPoint2D, operator-(),
 
     DocDeclStr(
         wxPoint2D, operator-(),

-        "the reflection of this point");
+        "the reflection of this point", "");

 
     wxPoint2D& operator+=(const wxPoint2D& pt);
     wxPoint2D& operator-=(const wxPoint2D& pt);
 
     wxPoint2D& operator+=(const wxPoint2D& pt);
     wxPoint2D& operator-=(const wxPoint2D& pt);


@@ -615,11 +666,11 @@ public:
 
     DocDeclStr(
         bool, operator==(const wxPoint2D& pt) const,
 
     DocDeclStr(
         bool, operator==(const wxPoint2D& pt) const,

-        "Test for equality");
+        "Test for equality", "");

     
     DocDeclStr(
         bool, operator!=(const wxPoint2D& pt) const,
     
     DocDeclStr(
         bool, operator!=(const wxPoint2D& pt) const,

-        "Test for inequality");
+        "Test for inequality", "");

 
     %name(x)double m_x;
     %name(y)double m_y;
 
     %name(x)double m_x;
     %name(y)double m_y;


@@ -632,19 +683,19 @@ public:
 
         DocAStr(Get,
                "Get() -> (x,y)",
 
         DocAStr(Get,
                "Get() -> (x,y)",

-               "Return x and y properties as a tuple.");               
+               "Return x and y properties as a tuple.", "");               

         PyObject* Get() {
         PyObject* Get() {

-            wxPyBeginBlockThreads();
+            bool blocked = wxPyBeginBlockThreads();

             PyObject* tup = PyTuple_New(2);
             PyTuple_SET_ITEM(tup, 0, PyFloat_FromDouble(self->m_x));
             PyTuple_SET_ITEM(tup, 1, PyFloat_FromDouble(self->m_y));
             PyObject* tup = PyTuple_New(2);
             PyTuple_SET_ITEM(tup, 0, PyFloat_FromDouble(self->m_x));
             PyTuple_SET_ITEM(tup, 1, PyFloat_FromDouble(self->m_y));

-            wxPyEndBlockThreads();
+            wxPyEndBlockThreads(blocked);

             return tup;
         }
     }
 
     %pythoncode {
             return tup;
         }
     }
 
     %pythoncode {

-    asTuple = Get
+    asTuple = wx._deprecated(Get, "asTuple is deprecated, use `Get` instead")

     def __str__(self):                   return str(self.Get())
     def __repr__(self):                  return 'wx.Point2D'+str(self.Get())
     def __len__(self):                   return len(self.Get())
     def __str__(self):                   return str(self.Get())
     def __repr__(self):                  return 'wx.Point2D'+str(self.Get())
     def __len__(self):                   return len(self.Get())


@@ -654,10 +705,8 @@ public:
         elif index == 1: self.y = val
         else: raise IndexError
     def __nonzero__(self):               return self.Get() != (0.0, 0.0)
         elif index == 1: self.y = val
         else: raise IndexError
     def __nonzero__(self):               return self.Get() != (0.0, 0.0)

-    def __getinitargs__(self):           return ()
-    def __getstate__(self):              return self.Get()
-    def __setstate__(self, state):       self.Set(*state)
-
+    __safe_for_unpickling__ = True
+    def __reduce__(self):                return (wx.Point2D, self.Get())

     }
 };
 
     }
 };