From 1d14e1836ab0989d5b34ed50ba43e6b67454eb54 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 4 May 2006 02:07:41 +0000 Subject: [PATCH] Add GetAsString git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39013 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/__gdi_rename.i | 3 +++ wxPython/src/_colour.i | 17 +++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/wxPython/src/__gdi_rename.i b/wxPython/src/__gdi_rename.i index 704029b0c4..df6a6656f0 100644 --- a/wxPython/src/__gdi_rename.i +++ b/wxPython/src/__gdi_rename.i @@ -4,6 +4,9 @@ #ifndef BUILDING_RENAMERS %rename(GDIObject) wxGDIObject; +%rename(C2S_NAME) wxC2S_NAME; +%rename(C2S_CSS_SYNTAX) wxC2S_CSS_SYNTAX; +%rename(C2S_HTML_SYNTAX) wxC2S_HTML_SYNTAX; %rename(Colour) wxColour; %rename(Palette) wxPalette; %rename(Pen) wxPen; diff --git a/wxPython/src/_colour.i b/wxPython/src/_colour.i index 7b1d7ef5bd..20467993dc 100644 --- a/wxPython/src/_colour.i +++ b/wxPython/src/_colour.i @@ -17,6 +17,13 @@ %newgroup; +enum { + wxC2S_NAME, // return colour name, when possible + wxC2S_CSS_SYNTAX, // return colour in rgb(r,g,b) syntax + wxC2S_HTML_SYNTAX, // return colour in #rrggbb syntax +}; + + DocStr(wxColour, "A colour is an object representing a combination of Red, Green, and Blue (RGB) intensity values, and is used to determine drawing colours, @@ -98,6 +105,16 @@ initialised with RGB values).", ""); ``wx.TheColourDatabase``.", "", SetFromName); + DocDeclStr( + wxString , GetAsString(long flags = wxC2S_NAME | wxC2S_CSS_SYNTAX) const, + "Return the colour as a string. Acceptable flags are: + + =================== ================================== + wx.C2S_NAME return colour name, when possible + wx.C2S_CSS_SYNTAX return colour in rgb(r,g,b) syntax + wx.C2S_HTML_SYNTAX return colour in #rrggbb syntax + =================== ==================================", ""); + DocDeclStr( long , GetPixel() const,