X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e70b4f10951f806a7b6cf7e65317a21421e2f3a6..69120ee48a66faa743b6e7c85a745806f53228ac:/src/msw/colour.cpp?ds=inline diff --git a/src/msw/colour.cpp b/src/msw/colour.cpp index eebf6ed159..db8be10974 100644 --- a/src/msw/colour.cpp +++ b/src/msw/colour.cpp @@ -6,7 +6,7 @@ // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) @@ -29,111 +29,102 @@ template<> void wxStringReadValue(const wxString &s , wxColour &data ) { - // copied from VS xrc - unsigned long tmp = 0; + // copied from VS xrc + unsigned long tmp = 0; - if (s.Length() != 7 || s[0u] != wxT('#') || - wxSscanf(s.c_str(), wxT("#%lX"), &tmp) != 1) + if (s.Length() != 7 || s[0u] != wxT('#') + || wxSscanf(s.c_str(), wxT("#%lX"), &tmp) != 1) { - wxLogError(_("String To Colour : Incorrect colour specification : %s"), - s.c_str() ); + wxLogError(_("String To Colour : Incorrect colour specification : %s"), + s.c_str() ); data = wxNullColour; } - else - { - data = wxColour((unsigned char) ((tmp & 0xFF0000) >> 16) , - (unsigned char) ((tmp & 0x00FF00) >> 8), - (unsigned char) ((tmp & 0x0000FF))); - } + else + { + data = wxColour((unsigned char) ((tmp & 0xFF0000) >> 16) , + (unsigned char) ((tmp & 0x00FF00) >> 8), + (unsigned char) ((tmp & 0x0000FF))); + } } template<> void wxStringWriteValue(wxString &s , const wxColour &data ) { - s = wxString::Format("#%02X%02X%02X", data.Red() , data.Green() , data.Blue() ) ; + s = wxString::Format(wxT("#%02X%02X%02X"), + data.Red(), data.Green(), data.Blue() ); } -IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_AND_STREAMERS_XTI( wxColour , wxObject , "wx/colour.h" , &wxToStringConverter , &wxFromStringConverter) +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 )) -WX_BEGIN_PROPERTIES_TABLE(wxColour) - 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() +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() -WX_CONSTRUCTOR_3( wxColour , unsigned char , Red , unsigned char , Green , unsigned char , Blue ) +wxCONSTRUCTOR_3( wxColour, unsigned char, Red, unsigned char, Green, unsigned char, Blue ) -WX_BEGIN_HANDLERS_TABLE(wxColour) -WX_END_HANDLERS_TABLE() +wxBEGIN_HANDLERS_TABLE(wxColour) +wxEND_HANDLERS_TABLE() #else IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject) #endif // Colour -wxColour::wxColour () -{ - m_isInit = FALSE; - m_pixel = 0; - m_red = m_blue = m_green = 0; -} - -wxColour::wxColour (unsigned char r, unsigned char g, unsigned char b) +void wxColour::Init() { - m_red = r; - m_green = g; - m_blue = b; - m_isInit = TRUE; - m_pixel = PALETTERGB (m_red, m_green, m_blue); + m_isInit = false; + m_pixel = 0; + m_red = + m_blue = + m_green = 0; } -wxColour::wxColour (const wxColour& col) +wxColour::wxColour(const wxColour& col) + :wxObject() { - m_red = col.m_red; - m_green = col.m_green; - m_blue = col.m_blue; - m_isInit = col.m_isInit; - m_pixel = col.m_pixel; + *this = col; } -wxColour& wxColour::operator =(const wxColour& col) +wxColour& wxColour::operator=(const wxColour& col) { - m_red = col.m_red; - m_green = col.m_green; - m_blue = col.m_blue; - m_isInit = col.m_isInit; - m_pixel = col.m_pixel; - return *this; + m_red = col.m_red; + m_green = col.m_green; + m_blue = col.m_blue; + m_isInit = col.m_isInit; + m_pixel = col.m_pixel; + return *this; } -void wxColour::InitFromName(const wxString& col) +void wxColour::InitFromName(const wxString& name) { - wxColour *the_colour = wxTheColourDatabase->FindColour (col); - if (the_colour) - { - m_red = the_colour->Red (); - m_green = the_colour->Green (); - m_blue = the_colour->Blue (); - m_isInit = TRUE; - } - else + if ( wxTheColourDatabase ) { - m_red = 0; - m_green = 0; - m_blue = 0; - m_isInit = FALSE; + wxColour col = wxTheColourDatabase->Find(name); + if ( col.Ok() ) + { + *this = col; + return; + } } - m_pixel = PALETTERGB (m_red, m_green, m_blue); + + // leave invalid + Init(); } wxColour::~wxColour() { } -void wxColour::Set (unsigned char r, unsigned char g, unsigned char b) +void wxColour::Set(unsigned char r, unsigned char g, unsigned char b) { - m_red = r; - m_green = g; - m_blue = b; - m_isInit = TRUE; - m_pixel = PALETTERGB (m_red, m_green, m_blue); + m_red = r; + m_green = g; + m_blue = b; + m_isInit = true; + m_pixel = PALETTERGB(m_red, m_green, m_blue); } +