X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e86d4e59c10a8110a5bcf714bca17a8eea65e8b8..d642db66a5efc82d374b813022c72ba88bc50839:/include/wx/cocoa/colour.h diff --git a/include/wx/cocoa/colour.h b/include/wx/cocoa/colour.h index 48986eb46e..3209d94f0c 100644 --- a/include/wx/cocoa/colour.h +++ b/include/wx/cocoa/colour.h @@ -19,28 +19,16 @@ // wxColour // ======================================================================== -class WXDLLEXPORT wxColour : public wxColourBase +class WXDLLIMPEXP_CORE 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); } + 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 ); @@ -48,9 +36,9 @@ 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; } + WX_NSColor GetNSColor() const { return m_cocoaNSColor; } unsigned char Red() const { return m_red; } unsigned char Green() const { return m_green; }