X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/198c264dbcf226b5df0eed219aef30d6fdc38a71..d814b237d9485a8698dde38f91325b83982a57e7:/src/common/colourcmn.cpp

diff --git a/src/common/colourcmn.cpp b/src/common/colourcmn.cpp
index 943ceb5683..d2e5bc16f0 100644
--- a/src/common/colourcmn.cpp
+++ b/src/common/colourcmn.cpp
@@ -30,6 +30,59 @@
 IMPLEMENT_VARIANT_OBJECT_EXPORTED(wxColour,WXDLLEXPORT)
 #endif
 
+
+// ----------------------------------------------------------------------------
+// XTI
+// ----------------------------------------------------------------------------
+
+#if wxUSE_EXTENDED_RTTI
+
+#include <string.h>
+
+template<> void wxStringReadValue(const wxString &s, wxColour &data )
+{
+    if ( !data.Set(s) )
+    {
+        wxLogError(_("String To Colour : Incorrect colour specification : %s"),
+                   s.c_str() );
+        data = wxNullColour;
+    }
+}
+
+template<> void wxStringWriteValue(wxString &s, const wxColour &data )
+{
+    s = data.GetAsString(wxC2S_HTML_SYNTAX);
+}
+
+wxTO_STRING_IMP( wxColour )
+wxFROM_STRING_IMP( wxColour )
+
+wxIMPLEMENT_DYNAMIC_CLASS_WITH_COPY_AND_STREAMERS_XTI( wxColour, wxObject,  \
+                                                      "wx/colour.h",  &wxTO_STRING( wxColour ), &wxFROM_STRING( wxColour ))
+//WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImpl<wxColour>)
+wxBEGIN_PROPERTIES_TABLE(wxColour)
+wxREADONLY_PROPERTY( Red, unsigned char, Red, wxEMPTY_PARAMETER_VALUE, \
+                    0 /*flags*/, wxT("Helpstring"), wxT("group"))
+wxREADONLY_PROPERTY( Green, unsigned char, Green, wxEMPTY_PARAMETER_VALUE, \
+                    0 /*flags*/, wxT("Helpstring"), wxT("group"))
+wxREADONLY_PROPERTY( Blue, unsigned char, Blue, wxEMPTY_PARAMETER_VALUE, \
+                    0 /*flags*/, wxT("Helpstring"), wxT("group"))
+wxEND_PROPERTIES_TABLE()
+
+wxDIRECT_CONSTRUCTOR_3( wxColour, unsigned char, Red, \
+                       unsigned char, Green, unsigned char, Blue )
+
+wxEMPTY_HANDLERS_TABLE(wxColour)
+#else
+
+#if wxCOLOUR_IS_GDIOBJECT
+wxIMPLEMENT_DYNAMIC_CLASS(wxColour, wxGDIObject)
+#else
+wxIMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
+#endif
+
+#endif
+
 // ============================================================================
 // wxString <-> wxColour conversions
 // ============================================================================
@@ -150,7 +203,7 @@ wxString wxColourBase::GetAsString(long flags) const
 }
 
 // static
-void wxColourBase::MakeMono(unsigned char* r, unsigned char* g, unsigned char* b, 
+void wxColourBase::MakeMono(unsigned char* r, unsigned char* g, unsigned char* b,
                             bool on)
 {
     *r = *g = *b = on ? 255 : 0;
@@ -173,7 +226,7 @@ void wxColourBase::MakeGrey(unsigned char* r, unsigned char* g, unsigned char* b
 }
 
 // static
-void wxColourBase::MakeDisabled(unsigned char* r, unsigned char* g, unsigned char* b, 
+void wxColourBase::MakeDisabled(unsigned char* r, unsigned char* g, unsigned char* b,
                                 unsigned char brightness)
 {
     //MakeGrey(r, g, b, brightness); // grey no-blend version
@@ -185,7 +238,7 @@ void wxColourBase::MakeDisabled(unsigned char* r, unsigned char* g, unsigned cha
 // AlphaBlend is used by ChangeLightness and MakeDisabled
 
 // static
-unsigned char wxColourBase::AlphaBlend(unsigned char fg, unsigned char bg, 
+unsigned char wxColourBase::AlphaBlend(unsigned char fg, unsigned char bg,
                                        double alpha)
 {
     double result = bg + (alpha * (fg - bg));