X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c3d15542d6047f49f493dbd5559fab99c06a336e..0b187670897ab1a29e609b581f44344d367c55d6:/src/mgl/colour.cpp diff --git a/src/mgl/colour.cpp b/src/mgl/colour.cpp index c40969e083..da27128ada 100644 --- a/src/mgl/colour.cpp +++ b/src/mgl/colour.cpp @@ -5,11 +5,11 @@ // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem +// Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "colour.h" #endif @@ -27,54 +27,47 @@ IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject) // Colour -wxColour::wxColour() +void wxColour::Init() { - m_red = m_blue = m_green = 0; - m_isInit = FALSE; + m_red = + m_blue = + m_green = 0; + m_isInit = false; } -wxColour::wxColour(unsigned char r, unsigned char g, unsigned char b) +wxColour::wxColour() { - m_red = r; - m_green = g; - m_blue = b; - m_isInit = TRUE; + Init(); } wxColour::wxColour(const wxColour& col) { - m_red = col.m_red; - m_green = col.m_green; - m_blue = col.m_blue; - m_isInit = col.m_isInit; + *this = 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; - return *this; + m_red = col.m_red; + m_green = col.m_green; + m_blue = col.m_blue; + m_isInit = col.m_isInit; + return *this; } -void wxColour::InitFromName(const wxString& col) +void wxColour::InitFromName(const wxString& name) { - wxColour *the_colour = wxTheColourDatabase->FindColour (col); - if (the_colour) + if ( wxTheColourDatabase ) { - m_red = the_colour->Red(); - m_green = the_colour->Green(); - m_blue = the_colour->Blue(); - m_isInit = TRUE; - } - else - { - m_red = 0; - m_green = 0; - m_blue = 0; - m_isInit = FALSE; + wxColour col = wxTheColourDatabase->Find(name); + if ( col.Ok() ) + { + *this = col; + return; + } } + + // leave invalid + Init(); } wxColour::~wxColour() @@ -83,19 +76,8 @@ wxColour::~wxColour() 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_red = r; + m_green = g; + m_blue = b; + m_isInit = true; } - -// 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 -