X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d23bf09c7fbbe4f026d61043e55c81cfc4a6bef2..3ed946f2835520aeae67c69582c068bf2e109008:/include/wx/cocoa/colour.h diff --git a/include/wx/cocoa/colour.h b/include/wx/cocoa/colour.h index d553f762bc..b2bc5796f1 100644 --- a/include/wx/cocoa/colour.h +++ b/include/wx/cocoa/colour.h @@ -24,25 +24,11 @@ class WXDLLEXPORT wxColour : public wxColourBase public: // constructors // ------------ - - // default - wxColour() { Init(); } - - // the other standard ones: notice that we can't use - // DEFINE_STD_WXCOLOUR_CONSTRUCTORS here because we need to call Init() to - // initialize m_cocoaNSColor and the macro doesn't do it - wxColour( ChannelType red, ChannelType green, ChannelType blue, - 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 char *colourName) { Init(); Set(colourName); } - wxColour(const wchar_t *colourName) { Init(); Set(colourName); } + DEFINE_STD_WXCOLOUR_CONSTRUCTORS // initialization using existing NSColor wxColour( WX_NSColor aColor ); - // copy ctors and assignment operators wxColour( const wxColour& col ); wxColour& operator = ( const wxColour& col ); @@ -50,8 +36,7 @@ public: virtual ~wxColour(); // accessors - bool Ok() const { return IsOk(); } - bool IsOk() const { return m_cocoaNSColor; } + virtual bool IsOk() const { return m_cocoaNSColor; } WX_NSColor GetNSColor() { return m_cocoaNSColor; } unsigned char Red() const { return m_red; }