X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/64e8a1f072f09865b57ce399fa4401009e08d314..3cebfef17b54f9dacc386f090827b8badb2773d2:/wxPython/src/_gdicmn.i?ds=sidebyside diff --git a/wxPython/src/_gdicmn.i b/wxPython/src/_gdicmn.i index 10e869f038..5ccbf5d5ba 100644 --- a/wxPython/src/_gdicmn.i +++ b/wxPython/src/_gdicmn.i @@ -130,6 +130,11 @@ public: ~wxSize(); +// %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), "Test for equality of wx.Size objects."); @@ -173,11 +178,11 @@ public: "Get() -> (width,height)", "Returns the width and height properties as a tuple."); 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)); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return tup; } } @@ -192,9 +197,8 @@ public: 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()) } }; @@ -247,11 +251,11 @@ public: "Get() -> (x,y)", "Return the x and y properties as a tuple. "); 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)); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return tup; } } @@ -267,9 +271,8 @@ public: 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()) } }; @@ -303,11 +306,18 @@ public: bool, operator!=(const wxPoint& pt), "Test for inequality of wx.Point objects."); + + +// %nokwargs operator+; +// %nokwargs operator-; +// %nokwargs operator+=; +// %nokwargs operator-=; DocDeclStr( wxPoint, operator+(const wxPoint& pt), "Add pt's proprties to this and return the result."); + DocDeclStr( wxPoint, operator-(const wxPoint& pt), "Subtract pt's proprties from this and return the result"); @@ -321,6 +331,27 @@ public: wxPoint&, operator-=(const wxPoint& pt), "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 { DocStr(Set, "Set both the x and y properties"); @@ -333,11 +364,11 @@ public: "Get() -> (x,y)", "Return the x and y properties as a tuple. "); 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)); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return tup; } } @@ -353,9 +384,8 @@ public: 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()) } }; @@ -502,13 +532,13 @@ public: "Get() -> (x,y,width,height)", "Return the rectangle properties as a tuple."); 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)); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return tup; } } @@ -526,9 +556,8 @@ public: 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()) } }; @@ -547,10 +576,10 @@ DocAStr(wxIntersectRect, dest = reg1.GetBox(); if (dest != wxRect(0,0,0,0)) { - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); wxRect* newRect = new wxRect(dest); obj = wxPyConstructObject((void*)newRect, wxT("wxRect"), True); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return obj; } Py_INCREF(Py_None); @@ -634,11 +663,11 @@ public: "Get() -> (x,y)", "Return x and y properties as a tuple."); 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)); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); return tup; } } @@ -654,10 +683,8 @@ public: 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()) } };