X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9ed0d735d588f42485461ea526596436c4c6ad4b..22026088535d0c7dafaae15133a8d1078195a366:/src/msw/colour.cpp?ds=sidebyside diff --git a/src/msw/colour.cpp b/src/msw/colour.cpp index b41790d4df..e1d9ee9c2d 100644 --- a/src/msw/colour.cpp +++ b/src/msw/colour.cpp @@ -9,7 +9,7 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "colour.h" #endif @@ -25,7 +25,22 @@ #include +#if wxUSE_EXTENDED_RTTI +IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_XTI( wxColour , wxObject , "wx/colour.h" ) + +WX_BEGIN_PROPERTIES_TABLE(wxColour) + WX_READONLY_PROPERTY( Red, unsigned char , Red , 0 ) + WX_READONLY_PROPERTY( Green, unsigned char , Green , 0 ) + WX_READONLY_PROPERTY( Blue, unsigned char , Blue , 0 ) +WX_END_PROPERTIES_TABLE() + +WX_CONSTRUCTOR_3( wxColour , unsigned char , Red , unsigned char , Green , unsigned char , Blue ) + +WX_BEGIN_HANDLERS_TABLE(wxColour) +WX_END_HANDLERS_TABLE() +#else IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject) +#endif // Colour @@ -96,14 +111,3 @@ void wxColour::Set (unsigned char r, unsigned char g, unsigned char b) m_isInit = TRUE; m_pixel = PALETTERGB (m_red, m_green, m_blue); } - -// Obsolete -#if WXWIN_COMPATIBILITY -void wxColour::Get (unsigned char *r, unsigned char *g, unsigned char *b) const -{ - *r = m_red; - *g = m_green; - *b = m_blue; -} -#endif -