X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3c7fc996a73e9f6a83067bc28a3c5581a3fee65..b098b62129781c0158ffa531a6de2aa9524d18bf:/include/wx/x11/colour.h diff --git a/include/wx/x11/colour.h b/include/wx/x11/colour.h index 9d9824199d..101055920a 100644 --- a/include/wx/x11/colour.h +++ b/include/wx/x11/colour.h @@ -44,7 +44,8 @@ public: virtual ~wxColour(); - 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); } @@ -64,8 +65,10 @@ protected: virtual wxObjectRefData *CreateRefData() const; virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; + virtual void + InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a); + virtual bool FromString(const wxChar *str); - virtual void InitWith( unsigned char red, unsigned char green, unsigned char blue ); private: DECLARE_DYNAMIC_CLASS(wxColour)