X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b150bffc9e137b1fbcb29592512642f65ed331f2..86ac84b8ce086e6bbda58f422d41f84268606e35:/include/wx/x11/colour.h diff --git a/include/wx/x11/colour.h b/include/wx/x11/colour.h index 249520c8e4..aad798657d 100644 --- a/include/wx/x11/colour.h +++ b/include/wx/x11/colour.h @@ -33,21 +33,17 @@ class WXDLLIMPEXP_FWD_CORE wxColour; // wxColour //----------------------------------------------------------------------------- -class WXDLLEXPORT wxColour : public wxColourBase +class WXDLLIMPEXP_CORE wxColour : public wxColourBase { public: // constructors // ------------ - - wxColour() {} DEFINE_STD_WXCOLOUR_CONSTRUCTORS virtual ~wxColour(); - bool IsOk() const { return m_refData != NULL; } - - bool operator == ( const wxColour& col ) const; - bool operator != ( const wxColour& col ) const { return !(*this == col); } + bool operator==(const wxColour& col) const; + bool operator!=(const wxColour& col) const { return !(*this == col); } unsigned char Red() const; unsigned char Green() const; @@ -60,9 +56,8 @@ public: WXColor *GetColor() const; protected: - // ref counting code - virtual wxObjectRefData *CreateRefData() const; - virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; + virtual wxGDIRefData *CreateGDIRefData() const; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; virtual void InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a); @@ -73,6 +68,4 @@ private: DECLARE_DYNAMIC_CLASS(wxColour) }; -#endif - -// _WX_COLOUR_H_ +#endif // _WX_COLOUR_H_