reSWIGged

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

diff --git a/wxPython/src/_gbsizer.i b/wxPython/src/_gbsizer.i
index a1b12901b8c59158540bf9d65721d0222e685326..a87e92eef492089c3212afcdc8cbb9a9e8cd25ec 100644 (file)
--- a/wxPython/src/_gbsizer.i
+++ b/wxPython/src/_gbsizer.i
@@ -65,8 +65,10 @@ public:
     void SetRow(int row);
     void SetCol(int col);
     
-    bool operator==(const wxGBPosition& p) const;
-    bool operator!=(const wxGBPosition& p) const;
+    %extend {
+        bool __eq__(const wxGBPosition* other) { return other ? (*self == *other) : False; }
+        bool __ne__(const wxGBPosition* other) { return other ? (*self != *other) : True;  }
+    }
 
     %extend {
         void Set(int row=0, int col=0) {
@@ -94,9 +96,8 @@ public:
         elif index == 1: self.SetCol(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.GBPosition, self.Get())
     }
 
     %pythoncode {
@@ -118,8 +119,10 @@ public:
     void SetRowspan(int rowspan);
     void SetColspan(int colspan);
     
-    bool operator==(const wxGBSpan& o) const;
-    bool operator!=(const wxGBSpan& o) const;
+    %extend {
+        bool __eq__(const wxGBSpan* other) { return other ? (*self == *other) : False; }
+        bool __ne__(const wxGBSpan* other) { return other ? (*self != *other) : True;  }
+    }
 
     %extend {
         void Set(int rowspan=1, int colspan=1) {
@@ -147,9 +150,8 @@ public:
         elif index == 1: self.SetColspan(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.GBSpan, self.Get())
     }
 
     %pythoncode {