X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aea95b1c3a8ae221cc3aade5ce49a3cf848fd56a..438959cca892a7651634cc3a7aad4819ac49b23c:/include/wx/gtk1/colour.h?ds=inline diff --git a/include/wx/gtk1/colour.h b/include/wx/gtk1/colour.h index cf91604445..b1d06275d5 100644 --- a/include/wx/gtk1/colour.h +++ b/include/wx/gtk1/colour.h @@ -20,12 +20,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 @@ -36,19 +36,14 @@ class WXDLLIMPEXP_CORE wxColour : public wxColourBase public: // constructors // ------------ - - // default - wxColour() { } DEFINE_STD_WXCOLOUR_CONSTRUCTORS virtual ~wxColour(); - virtual bool FromString(const wxChar *str); - - bool Ok() const { return m_refData != NULL; } + virtual bool FromString(const wxString& str); - 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; @@ -62,8 +57,8 @@ public: 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);