X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6304d5b49b488f7bc130c933bcece731ca10d4c7..a721fd82b7ca8c97048453d4aaff559e8f741d69:/include/wx/cocoa/colour.h?ds=sidebyside diff --git a/include/wx/cocoa/colour.h b/include/wx/cocoa/colour.h index c1bbc340ed..3209d94f0c 100644 --- a/include/wx/cocoa/colour.h +++ b/include/wx/cocoa/colour.h @@ -19,29 +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); } - wxColour(const wxChar *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 ); @@ -49,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; } @@ -80,9 +67,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); }