X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c2b9ae5f7fdabc38a9814b5a1a8d16932a610024..43c42c18d36c703a88b1b7b697bac27fe5608eca:/src/msw/colour.cpp diff --git a/src/msw/colour.cpp b/src/msw/colour.cpp index acd528ef63..15da19612c 100644 --- a/src/msw/colour.cpp +++ b/src/msw/colour.cpp @@ -26,42 +26,6 @@ #include -#if wxUSE_EXTENDED_RTTI - -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 ) - -IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_AND_STREAMERS_XTI( wxColour , wxObject , "wx/colour.h" , &wxTO_STRING( wxColour ) , &wxFROM_STRING( wxColour )) - -wxBEGIN_PROPERTIES_TABLE(wxColour) - wxREADONLY_PROPERTY( Red, unsigned char, Red, EMPTY_MACROVALUE , 0 /*flags*/, wxT("Helpstring"), wxT("group")) - wxREADONLY_PROPERTY( Green, unsigned char, Green, EMPTY_MACROVALUE , 0 /*flags*/, wxT("Helpstring"), wxT("group")) - wxREADONLY_PROPERTY( Blue, unsigned char, Blue, EMPTY_MACROVALUE , 0 /*flags*/, wxT("Helpstring"), wxT("group")) -wxEND_PROPERTIES_TABLE() - -wxDIRECT_CONSTRUCTOR_3( wxColour, unsigned char, Red, unsigned char, Green, unsigned char, Blue ) - -wxBEGIN_HANDLERS_TABLE(wxColour) -wxEND_HANDLERS_TABLE() -#else -IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject) -#endif - // Colour void wxColour::Init() @@ -74,10 +38,6 @@ void wxColour::Init() m_green = 0; } -wxColour::~wxColour() -{ -} - void wxColour::InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a) {