X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cb3db09022512bcbb6c6c41dd6859ab9245186a1..58ce18f2fdadecffb21e27555115af708325cf18:/include/wx/x11/colour.h diff --git a/include/wx/x11/colour.h b/include/wx/x11/colour.h index 502886f31f..aad798657d 100644 --- a/include/wx/x11/colour.h +++ b/include/wx/x11/colour.h @@ -22,32 +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 - ~wxColour(); - - bool Ok() const { return m_refData != NULL; } + virtual ~wxColour(); - 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,17 +56,16 @@ 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 bool FromString(const wxChar *str); - 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) }; -#endif - -// _WX_COLOUR_H_ +#endif // _WX_COLOUR_H_