X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6304d5b49b488f7bc130c933bcece731ca10d4c7..d350fbec220fb134b9bf82a7e442d0accd4f95c1:/include/wx/cocoa/colour.h diff --git a/include/wx/cocoa/colour.h b/include/wx/cocoa/colour.h index c1bbc340ed..dbdc52ae62 100644 --- a/include/wx/cocoa/colour.h +++ b/include/wx/cocoa/colour.h @@ -35,8 +35,9 @@ public: ChannelType alpha = wxALPHA_OPAQUE ) { Init(); Set(red, green, blue, alpha); } wxColour(unsigned long colRGB) { Init(); Set(colRGB); } - wxColour(const wxString &colourName) { Init(); Set(colourName); } - wxColour(const wxChar *colourName) { Init(); Set(colourName); } + wxColour(const wxString& colourName) { Init(); Set(colourName); } + wxColour(const char *colourName) { Init(); Set(colourName); } + wxColour(const wchar_t *colourName) { Init(); Set(colourName); } // initialization using existing NSColor wxColour( WX_NSColor aColor ); @@ -49,7 +50,6 @@ public: virtual ~wxColour(); // accessors - bool Ok() const { return IsOk(); } bool IsOk() const { return m_cocoaNSColor; } WX_NSColor GetNSColor() { return m_cocoaNSColor; } @@ -80,9 +80,6 @@ public: unsigned char alpha = wxALPHA_OPAQUE) { wxColourBase::Set(red, green, blue, alpha); } - bool Set(const wxChar *str) - { return wxColourBase::Set(str); } - bool Set(const wxString &str) { return wxColourBase::Set(str); }