X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/62f864c32c53356b7228591c85b14abc491c46f0..3b5d20079c81e0106b3dead7cd8d7337bf3f36f4:/src/mac/classic/colour.cpp diff --git a/src/mac/classic/colour.cpp b/src/mac/classic/colour.cpp index 195914413f..17760ac498 100644 --- a/src/mac/classic/colour.cpp +++ b/src/mac/classic/colour.cpp @@ -1,21 +1,22 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: colour.cpp +// Name: src/mac/classic/colour.cpp // Purpose: wxColour class // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "colour.h" -#endif +#include "wx/wxprec.h" -#include "wx/gdicmn.h" #include "wx/colour.h" +#ifndef WX_PRECOMP + #include "wx/gdicmn.h" +#endif + IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject) // Colour @@ -74,27 +75,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;