X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/edc536d358374987326d93adb1012b6eda9435a0..137c8bde085d6d5b7c459902d2ea1a198ab48765:/src/cocoa/colour.mm?ds=sidebyside diff --git a/src/cocoa/colour.mm b/src/cocoa/colour.mm index 9a8e057b07..94c1f4cc86 100644 --- a/src/cocoa/colour.mm +++ b/src/cocoa/colour.mm @@ -10,12 +10,13 @@ ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" -#ifndef WX_PRECOMP -#endif //WX_PRECOMP -#include "wx/gdicmn.h" #include "wx/colour.h" +#ifndef WX_PRECOMP + #include "wx/gdicmn.h" +#endif //WX_PRECOMP + #include "wx/cocoa/autorelease.h" #import @@ -55,28 +56,12 @@ 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 () { [m_cocoaNSColor release]; } -void wxColour::Set (unsigned char r, unsigned char g, unsigned char b) +void wxColour::InitWith (unsigned char r, unsigned char g, unsigned char b) { wxAutoNSAutoreleasePool pool; [m_cocoaNSColor release];