Force integer values for positions and sizes

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

diff --git a/wxPython/src/_colour.i b/wxPython/src/_colour.i
index c6ad86aa897494a522a9c71caefb1ed6ecc86182..f16e701c48d928b147c27c40c1198e41aae8968a 100644 (file)
--- a/wxPython/src/_colour.i
+++ b/wxPython/src/_colour.i
@@ -30,11 +30,13 @@ public:
     unsigned char Blue();
     bool Ok();
     void Set(unsigned char red, unsigned char green, unsigned char blue);
-    %name(SetRBG) void Set(unsigned long colRGB);
+    %name(SetRGB) void Set(unsigned long colRGB);
 
     bool operator==(const wxColour& colour) const;
     bool operator != (const wxColour& colour) const;
 
+    void InitFromName(const wxString& colourName);
+
     %extend {
         PyObject* Get() {
             PyObject* rv = PyTuple_New(3);
@@ -73,17 +75,17 @@ public:
     %pythoncode {
         asTuple = Get
         def __str__(self):                  return str(self.asTuple())
-        def __repr__(self):                 return 'wxColour' + str(self.asTuple())
+        def __repr__(self):                 return 'wx.Colour' + str(self.asTuple())
         def __nonzero__(self):              return self.Ok()
-        def __getinitargs__(self):          return ()
-        def __getstate__(self):             return self.asTuple()
-        def __setstate__(self, state):      self.Set(*state)
+        __safe_for_unpickling__ = True
+        def __reduce__(self):               return (Colour, self.Get())
         }
 };
 
-%pythoncode {
-    Color = Colour
-    NamedColor = NamedColour    
-}
+// %pythoncode {
+//     Color = Colour
+//     NamedColor = NamedColour    
+// }
+
 //---------------------------------------------------------------------------