Fixed compilation error

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

diff --git a/wxPython/src/misc.i b/wxPython/src/misc.i
index db74ff8614eb7e5648a46016f8273e51191a76ed..11ed0f1e6f62aab5933201e77a10345cd7f9f166 100644 (file)
--- 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;
         }
             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 = "
     }
 
     %pragma(python) addtoclass = "


@@ -122,8 +128,9 @@ public:
         }
 
         int __cmp__(const wxRealPoint* p) {
         }
 
         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 = "
         }
     }
     %pragma(python) addtoclass = "


@@ -169,8 +176,9 @@ public:
         }
 
         int __cmp__(const wxPoint* p) {
         }
 
         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 = "
         }
     }
     %pragma(python) addtoclass = "


@@ -237,8 +245,9 @@ public:
         }
 
         int __cmp__(const wxRect* rect) {
         }
 
         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)) {
         dest = reg1.GetBox();
 
         if (dest != wxRect(0,0,0,0)) {

-            bool doSave = wxPyRestoreThread();
+            wxPyTState* state = wxPyBeginBlockThreads();

             wxRect* newRect = new wxRect(dest);
             obj = wxPyConstructObject((void*)newRect, "wxRect");
             PyObject* one = PyInt_FromLong(1);
             PyObject_SetAttrString(obj, "thisown", one);
             Py_DECREF(one);
             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(state);

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