X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aea95b1c3a8ae221cc3aade5ce49a3cf848fd56a..b04237742c51e022af8ca8fe8933437734f392a3:/include/wx/cocoa/colour.h diff --git a/include/wx/cocoa/colour.h b/include/wx/cocoa/colour.h index cfdcd373f3..3209d94f0c 100644 --- a/include/wx/cocoa/colour.h +++ b/include/wx/cocoa/colour.h @@ -19,20 +19,16 @@ // wxColour // ======================================================================== -class WXDLLEXPORT wxColour : public wxColourBase +class WXDLLIMPEXP_CORE wxColour : public wxColourBase { public: // constructors // ------------ - - // default - wxColour() { Init(); } 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 ); @@ -40,8 +36,9 @@ public: virtual ~wxColour(); // accessors - bool Ok() 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; } @@ -70,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); }