A huge glob of changes in the 2.4 branch merged over to HEAD

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

diff --git a/wxPython/src/gdi.i b/wxPython/src/gdi.i
index d3fe92e1ae9784e35709dba8721f66ec2da9568d..751642779f7a4f7e265830594e9fc29ffbbabf18 100644 (file)
--- a/wxPython/src/gdi.i
+++ b/wxPython/src/gdi.i
@@ -465,7 +465,7 @@ public:
 
     %pragma(python) addtoclass = "asTuple = Get
     def __str__(self):                  return str(self.asTuple())
-    def __repr__(self):                 return 'wxColour:' + str(self.asTuple())
+    def __repr__(self):                 return 'wxColour' + str(self.asTuple())
     def __nonzero__(self):              return self.Ok()
     def __getinitargs__(self):          return ()
     def __getstate__(self):             return self.asTuple()
@@ -1210,6 +1210,10 @@ public:
         void Next() {
             (*self) ++;
         }
+
+        bool __nonzero__() {
+            return self->operator bool();
+        }
     };
 };