event exposure

[wxWidgets.git] / src / msw / colour.cpp

diff --git a/src/msw/colour.cpp b/src/msw/colour.cpp
index 1f99c2a34832a2313f6a5cc6aea128434fb66e23..629336cc4aea04ce2ddc6183d429a1e3686da7a0 100644 (file)
--- a/src/msw/colour.cpp
+++ b/src/msw/colour.cpp
@@ -27,8 +27,6 @@
 
 #if wxUSE_EXTENDED_RTTI
 
 
 #if wxUSE_EXTENDED_RTTI
 

-/*
-

 template<> void wxStringReadValue(const wxString &s , wxColour &data )
 {
        // copied from VS xrc
 template<> void wxStringReadValue(const wxString &s , wxColour &data )
 {
        // copied from VS xrc


@@ -51,19 +49,15 @@ template<> void wxStringReadValue(const wxString &s , wxColour &data )
 
 template<> void wxStringWriteValue(wxString &s , const wxColour &data )
 {
 
 template<> void wxStringWriteValue(wxString &s , const wxColour &data )
 {

-       s = wxString::Format("#%2X%2X%2X", data.Red() , data.Green() , data.Blue() ) ;
+       s = wxString::Format(wxT("#%02X%02X%02X"), data.Red() , data.Green() , data.Blue() ) ;

 }
 
 }
 

-WX_CUSTOM_TYPE_INFO(wxColour)
-
-*/
-
-IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_XTI( wxColour , wxObject , "wx/colour.h" ) 
+IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_AND_STREAMERS_XTI( wxColour , wxObject , "wx/colour.h" ,  &wxToStringConverter<wxColour> , &wxFromStringConverter<wxColour>) 

 
 WX_BEGIN_PROPERTIES_TABLE(wxColour)
 
 WX_BEGIN_PROPERTIES_TABLE(wxColour)

-       WX_READONLY_PROPERTY( Red, unsigned char , Red , 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-       WX_READONLY_PROPERTY( Green, unsigned char  , Green , 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) 
-       WX_READONLY_PROPERTY( Blue, unsigned char , Blue , 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+       WX_READONLY_PROPERTY( Red, unsigned char , Red ,  , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+       WX_READONLY_PROPERTY( Green, unsigned char  , Green ,  , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) 
+       WX_READONLY_PROPERTY( Blue, unsigned char , Blue ,  , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))

 WX_END_PROPERTIES_TABLE()
 
 WX_CONSTRUCTOR_3( wxColour , unsigned char , Red , unsigned char , Green , unsigned char , Blue )  
 WX_END_PROPERTIES_TABLE()
 
 WX_CONSTRUCTOR_3( wxColour , unsigned char , Red , unsigned char , Green , unsigned char , Blue )