X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/edc536d358374987326d93adb1012b6eda9435a0..2cf3a6d7bef6f20bea35062dd3d4dbf0aec9efb5:/src/mac/classic/colour.cpp diff --git a/src/mac/classic/colour.cpp b/src/mac/classic/colour.cpp index 1b1e1052db..17760ac498 100644 --- a/src/mac/classic/colour.cpp +++ b/src/mac/classic/colour.cpp @@ -9,9 +9,14 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#include "wx/gdicmn.h" +#include "wx/wxprec.h" + #include "wx/colour.h" +#ifndef WX_PRECOMP + #include "wx/gdicmn.h" +#endif + IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject) // Colour @@ -70,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;