X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd9f7fea29e3f8bb61861f52984b7943512346ac..3a04f1432d64cb06c275cfd3320490a0c350db7a:/wxPython/src/_colour.i diff --git a/wxPython/src/_colour.i b/wxPython/src/_colour.i index d7557387a0..55af312eef 100644 --- 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,7 +75,7 @@ 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() @@ -81,5 +83,9 @@ public: } }; +%pythoncode { + Color = Colour + NamedColor = NamedColour +} //---------------------------------------------------------------------------