Updated universal setup.

[wxWidgets.git] / include / wx / colour.h

diff --git a/include/wx/colour.h b/include/wx/colour.h
index 4de29da610b8e687eaa2396915df441b118ff105..15833968a46d03d6d1698c33223f408d91618e8a 100644 (file)
--- a/include/wx/colour.h
+++ b/include/wx/colour.h
@@ -16,7 +16,7 @@
 #include "wx/gdiobj.h"
 
 
 #include "wx/gdiobj.h"
 
 

-// the standard wxColour constructor.
+// the standard wxColour constructors;

 // this macro avoids to repeat these lines across all colour.h files, since
 // Set() is a virtual function and thus cannot be called by wxColourBase
 // constructors
 // this macro avoids to repeat these lines across all colour.h files, since
 // Set() is a virtual function and thus cannot be called by wxColourBase
 // constructors


@@ -28,7 +28,7 @@
     wxColour(const wxChar *colourName) { Set(colourName); }
 
 
     wxColour(const wxChar *colourName) { Set(colourName); }
 
 

-// for wxString <-> wxColour
+// flags for wxColour -> wxString conversion (see wxColour::GetAsString)

 #define wxC2S_NAME              1   // return colour name, when possible
 #define wxC2S_CSS_SYNTAX        2   // return colour in rgb(r,g,b) syntax
 #define wxC2S_HTML_SYNTAX       4   // return colour in #rrggbb syntax
 #define wxC2S_NAME              1   // return colour name, when possible
 #define wxC2S_CSS_SYNTAX        2   // return colour in rgb(r,g,b) syntax
 #define wxC2S_HTML_SYNTAX       4   // return colour in #rrggbb syntax


@@ -95,9 +95,10 @@ public:
     // old, deprecated
     // ---------------
 
     // old, deprecated
     // ---------------
 

-    static wxColour CreateByName(const wxString& name);
-    void InitFromName(const wxString& col)
-        { Set(col); }
+#if WXWIN_COMPATIBILITY_2_6
+    wxDEPRECATED( static wxColour CreateByName(const wxString& name) );
+    wxDEPRECATED( void InitFromName(const wxString& col) );
+#endif

 };
 
 
 };