From 7d01c54d7f264b14e75d67b0b590271b138be7ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?W=C5=82odzimierz=20Skiba?= <abx@abx.art.pl>
Date: Fri, 28 Apr 2006 17:59:28 +0000
Subject: [PATCH] Final touch for wxColour <-> wxString and wxColourBase by
 Francesco Montorsi.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38947 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/colour.h      | 11 ++++++-----
 src/common/colourcmn.cpp | 10 ++++++++++
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/include/wx/colour.h b/include/wx/colour.h
index 4de29da610..15833968a4 100644
--- a/include/wx/colour.h
+++ b/include/wx/colour.h
@@ -16,7 +16,7 @@
 #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
@@ -28,7 +28,7 @@
     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
@@ -95,9 +95,10 @@ public:
     // 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
 };
 
 
diff --git a/src/common/colourcmn.cpp b/src/common/colourcmn.cpp
index 4c7d7c088f..114dd597a6 100644
--- a/src/common/colourcmn.cpp
+++ b/src/common/colourcmn.cpp
@@ -101,7 +101,17 @@ wxString wxColourBase::GetAsString(long flags) const
     return colName;
 }
 
+#if WXWIN_COMPATIBILITY_2_6
+
+// static
 wxColour wxColourBase::CreateByName(const wxString& name)
 {
     return wxColour(name);
 }
+
+void wxColourBase::InitFromName(const wxString& col)
+{
+    Set(col);
+}
+
+#endif // WXWIN_COMPATIBILITY_2_6