X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e86d4e59c10a8110a5bcf714bca17a8eea65e8b8..5b464d6bbd088e122bca53f2a4a4ce1f09378de4:/include/wx/x11/colour.h diff --git a/include/wx/x11/colour.h b/include/wx/x11/colour.h index 27e64ac622..aad798657d 100644 --- a/include/wx/x11/colour.h +++ b/include/wx/x11/colour.h @@ -22,33 +22,28 @@ // 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 //----------------------------------------------------------------------------- -class WXDLLEXPORT wxColour : public wxColourBase +class WXDLLIMPEXP_CORE wxColour : public wxColourBase { public: // constructors // ------------ - - wxColour() {} DEFINE_STD_WXCOLOUR_CONSTRUCTORS virtual ~wxColour(); - 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); } + bool operator==(const wxColour& col) const; + bool operator!=(const wxColour& col) const { return !(*this == col); } unsigned char Red() const; unsigned char Green() const; @@ -61,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); @@ -74,6 +68,4 @@ private: DECLARE_DYNAMIC_CLASS(wxColour) }; -#endif - -// _WX_COLOUR_H_ +#endif // _WX_COLOUR_H_