X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..db60c20db8321d7fb0604e33fe7288ddb38c496e:/src/mgl/colour.cpp diff --git a/src/mgl/colour.cpp b/src/mgl/colour.cpp index efba265327..4232f86476 100644 --- a/src/mgl/colour.cpp +++ b/src/mgl/colour.cpp @@ -1,24 +1,25 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: colour.cpp +// Name: src/mgl/colour.cpp // Purpose: wxColour class // Author: Julian Smart // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif -#include "wx/gdicmn.h" #include "wx/colour.h" +#include "wx/gdicmn.h" + IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject) // Colour @@ -50,27 +51,11 @@ wxColour& wxColour::operator =(const wxColour& col) return *this; } -void wxColour::InitFromName(const wxString& name) -{ - if ( wxTheColourDatabase ) - { - wxColour col = wxTheColourDatabase->Find(name); - if ( col.Ok() ) - { - *this = col; - return; - } - } - - // leave invalid - Init(); -} - wxColour::~wxColour() { } -void wxColour::Set(unsigned char r, unsigned char g, unsigned char b) +void wxColour::InitWith(unsigned char r, unsigned char g, unsigned char b) { m_red = r; m_green = g;