X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/40989e46b86777dd211faeb3e5d2366cdcc6d8cd..c3c62822fdda9d340179dec663a806e905882cc9:/include/wx/x11/colour.h?ds=sidebyside diff --git a/include/wx/x11/colour.h b/include/wx/x11/colour.h index 8f1b3a631f..4ae37558b6 100644 --- a/include/wx/x11/colour.h +++ b/include/wx/x11/colour.h @@ -22,12 +22,12 @@ // classes //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxDC; -class WXDLLIMPEXP_CORE wxPaintDC; -class WXDLLIMPEXP_CORE wxBitmap; -class WXDLLIMPEXP_CORE wxWindow; +class WXDLLIMPEXP_FWD_CORE wxDC; +class WXDLLIMPEXP_FWD_CORE wxPaintDC; +class WXDLLIMPEXP_FWD_CORE wxBitmap; +class WXDLLIMPEXP_FWD_CORE wxWindow; -class WXDLLIMPEXP_CORE wxColour; +class WXDLLIMPEXP_FWD_CORE wxColour; //----------------------------------------------------------------------------- // wxColour @@ -42,11 +42,10 @@ public: wxColour() {} DEFINE_STD_WXCOLOUR_CONSTRUCTORS - ~wxColour(); + virtual ~wxColour(); - virtual bool FromString(const wxChar *str); - - bool Ok() const { return m_refData != NULL; } + bool Ok() const { return IsOk(); } + bool IsOk() const { return m_refData != NULL; } bool operator == ( const wxColour& col ) const; bool operator != ( const wxColour& col ) const { return !(*this == col); } @@ -66,7 +65,10 @@ protected: virtual wxObjectRefData *CreateRefData() const; virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; - virtual void InitWith( unsigned char red, unsigned char green, unsigned char blue ); + virtual void + InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a); + + virtual bool FromString(const wxString& str); private: DECLARE_DYNAMIC_CLASS(wxColour)