Add GetAsString

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39013 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/src/__gdi_rename.i b/wxPython/src/__gdi_rename.i
index 704029b0c477eb2c1b9ec04656587513096e773c..df6a6656f06edf437deda5310b01b771173810bd 100644 (file)
--- a/wxPython/src/__gdi_rename.i
+++ b/wxPython/src/__gdi_rename.i
@@ -4,6 +4,9 @@
 #ifndef BUILDING_RENAMERS
 
 %rename(GDIObject)                          wxGDIObject;
 #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;
 %rename(Colour)                             wxColour;
 %rename(Palette)                            wxPalette;
 %rename(Pen)                                wxPen;

diff --git a/wxPython/src/_colour.i b/wxPython/src/_colour.i
index 7b1d7ef5bd6f6d5456ca41fd548c3aad41236bc7..20467993dc873aac83cc68979bb8842f44a121b0 100644 (file)
--- a/wxPython/src/_colour.i
+++ b/wxPython/src/_colour.i
@@ -17,6 +17,13 @@
 %newgroup;
 
 
 %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,
 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);
     
 ``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,
     
     DocDeclStr(
         long , GetPixel() const,