X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9416aa89ca06d0fb20b1002e026d2c7ac7aa6a17..8dba8632c5bcd64724e2e9e2d40e295555a0cb86:/wxPython/src/misc.i diff --git a/wxPython/src/misc.i b/wxPython/src/misc.i index db74ff8614..af6c141f00 100644 --- a/wxPython/src/misc.i +++ b/wxPython/src/misc.i @@ -75,6 +75,12 @@ public: PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y)); return tup; } + + int __cmp__(const wxSize* sz) { + if (! sz) return 1; + if (*self == *sz) return 0; + return -1; + } } %pragma(python) addtoclass = " @@ -122,8 +128,9 @@ public: } int __cmp__(const wxRealPoint* p) { - if (! p) return 0; - return *self == *p; + if (! p) return 1; + if (*self == *p) return 0; + return -1; } } %pragma(python) addtoclass = " @@ -169,8 +176,9 @@ public: } int __cmp__(const wxPoint* p) { - if (! p) return 0; - return *self == *p; + if (! p) return 1; + if (*self == *p) return 0; + return -1; } } %pragma(python) addtoclass = " @@ -237,8 +245,9 @@ public: } int __cmp__(const wxRect* rect) { - if (! rect) return 0; - return *self == *rect; + if (! rect) return 1; + if (*self == *rect) return 0; + return -1; } } @@ -306,13 +315,13 @@ public: dest = reg1.GetBox(); if (dest != wxRect(0,0,0,0)) { - bool doSave = wxPyRestoreThread(); + wxPyBeginBlockThreads(); wxRect* newRect = new wxRect(dest); obj = wxPyConstructObject((void*)newRect, "wxRect"); PyObject* one = PyInt_FromLong(1); PyObject_SetAttrString(obj, "thisown", one); Py_DECREF(one); - wxPySaveThread(doSave); + wxPyEndBlockThreads(); return obj; } Py_INCREF(Py_None);