Added patch to wxPoint_LIST_helper from Tim Hochberg that should make

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

diff --git a/wxPython/src/misc.i b/wxPython/src/misc.i
index 94e2143b05b1bd570da1d465b94b194f6a092543..36c75d98d6d52e890bdb4d6131d46963ef054626 100644 (file)
--- a/wxPython/src/misc.i
+++ b/wxPython/src/misc.i
@@ -28,6 +28,10 @@
 %import _defs.i
 
 
 %import _defs.i
 
 

+%{
+    static wxString wxPyEmptyStr("");
+%}
+

 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 
 


@@ -56,8 +60,17 @@ public:
             return tup;
         }
     }
             return tup;
         }
     }

-    %pragma(python) addtoclass = "def __str__(self): return str(self.asTuple())"
-    %pragma(python) addtoclass = "def __repr__(self): return str(self.asTuple())"
+
+    %pragma(python) addtoclass = "
+    def __str__(self):                   return str(self.asTuple())
+    def __repr__(self):                  return str(self.asTuple())
+    def __len__(self):                   return len(self.asTuple())
+    def __getitem__(self, index):        return self.asTuple()[index]
+    def __setitem__(self, index, val):
+        if index == 0: self.width = val
+        elif index == 1: self.height = val
+        else: raise IndexError
+"

 
 };
 
 
 };
 


@@ -97,8 +110,16 @@ public:
             return *self == *p;
         }
     }
             return *self == *p;
         }
     }

-    %pragma(python) addtoclass = "def __str__(self): return str(self.asTuple())"
-    %pragma(python) addtoclass = "def __repr__(self): return str(self.asTuple())"
+    %pragma(python) addtoclass = "
+    def __str__(self):                   return str(self.asTuple())
+    def __repr__(self):                  return str(self.asTuple())
+    def __len__(self):                   return len(self.asTuple())
+    def __getitem__(self, index):        return self.asTuple()[index]
+    def __setitem__(self, index, val):
+        if index == 0: self.width = val
+        elif index == 1: self.height = val
+        else: raise IndexError
+"

 };
 
 
 };
 
 


@@ -136,8 +157,16 @@ public:
             return *self == *p;
         }
     }
             return *self == *p;
         }
     }

-    %pragma(python) addtoclass = "def __str__(self): return str(self.asTuple())"
-    %pragma(python) addtoclass = "def __repr__(self): return str(self.asTuple())"
+    %pragma(python) addtoclass = "
+    def __str__(self):                   return str(self.asTuple())
+    def __repr__(self):                  return str(self.asTuple())
+    def __len__(self):                   return len(self.asTuple())
+    def __getitem__(self, index):        return self.asTuple()[index]
+    def __setitem__(self, index, val):
+        if index == 0: self.x = val
+        elif index == 1: self.y = val
+        else: raise IndexError
+"

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------


@@ -197,9 +226,18 @@ public:
         }
     }
 
         }
     }
 

-    %pragma(python) addtoclass = "def __str__(self): return str(self.asTuple())"
-    %pragma(python) addtoclass = "def __repr__(self): return str(self.asTuple())"

     %pragma(python) addtoclass = "
     %pragma(python) addtoclass = "

+    def __str__(self):                   return str(self.asTuple())
+    def __repr__(self):                  return str(self.asTuple())
+    def __len__(self):                   return len(self.asTuple())
+    def __getitem__(self, index):        return self.asTuple()[index]
+    def __setitem__(self, index, val):
+        if index == 0: self.x = val
+        elif index == 1: self.y = val
+        elif index == 2: self.width = val
+        elif index == 3: self.height = val
+        else: raise IndexError
+

     # override the __getattr__ made by SWIG
     def __getattr__(self, name):
         d = {
     # override the __getattr__ made by SWIG
     def __getattr__(self, name):
         d = {


@@ -255,7 +293,9 @@ public:
             bool doSave = wxPyRestoreThread();
             wxRect* newRect = new wxRect(dest);
             obj = wxPyConstructObject((void*)newRect, "wxRect");
             bool doSave = wxPyRestoreThread();
             wxRect* newRect = new wxRect(dest);
             obj = wxPyConstructObject((void*)newRect, "wxRect");

-            PyObject_SetAttrString(obj, "thisown", PyInt_FromLong(1));
+            PyObject* one = PyInt_FromLong(1);
+            PyObject_SetAttrString(obj, "thisown", one);
+            Py_DECREF(one);

             wxPySaveThread(doSave);
             return obj;
         }
             wxPySaveThread(doSave);
             return obj;
         }


@@ -272,6 +312,7 @@ long wxNewId();
 void wxRegisterId(long id);
 %name(NewId) long wxNewId();
 %name(RegisterId) void wxRegisterId(long id);
 void wxRegisterId(long id);
 %name(NewId) long wxNewId();
 %name(RegisterId) void wxRegisterId(long id);

+long wxGetCurrentId();

 
 void wxBell();
 void wxDisplaySize(int *OUTPUT, int *OUTPUT);
 
 void wxBell();
 void wxDisplaySize(int *OUTPUT, int *OUTPUT);


@@ -292,6 +333,7 @@ wxString wxGetOsDescription();
 void wxSleep(int secs);
 void wxUsleep(unsigned long milliseconds);
 bool wxYield();
 void wxSleep(int secs);
 void wxUsleep(unsigned long milliseconds);
 bool wxYield();

+bool wxYieldIfNeeded();

 void wxEnableTopLevelWindows(bool enable);
 
 %inline %{
 void wxEnableTopLevelWindows(bool enable);
 
 %inline %{