X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/edc536d358374987326d93adb1012b6eda9435a0..86ac84b8ce086e6bbda58f422d41f84268606e35:/include/wx/x11/colour.h diff --git a/include/wx/x11/colour.h b/include/wx/x11/colour.h index e5735c3b2e..aad798657d 100644 --- a/include/wx/x11/colour.h +++ b/include/wx/x11/colour.h @@ -22,61 +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 wxGDIObject +class WXDLLIMPEXP_CORE wxColour : public wxColourBase { public: // constructors // ------------ + DEFINE_STD_WXCOLOUR_CONSTRUCTORS - // default - wxColour() { } + virtual ~wxColour(); - // from separate RGB - wxColour( unsigned char red, unsigned char green, unsigned char blue ); - - // from packed RGB - wxColour( unsigned long colRGB ) { Set(colRGB); } - - // Implicit conversion from the colour name - wxColour( const wxString &colourName ) { InitFromName(colourName); } - wxColour( const char *colourName ) { InitFromName( wxString::FromAscii(colourName) ); } -#if wxUSE_UNICODE - wxColour( const wxChar *colourName ) { InitFromName( wxString(colourName) ); } -#endif - - // Get colour from name or wxNullColour - static wxColour CreateByName(const wxString& name); - - wxColour( const wxColour& col ) { Ref(col); } - wxColour& operator = ( const wxColour& col ) { Ref(col); return *this; } - - ~wxColour(); - - bool Ok() const { return m_refData != NULL; } - - bool operator == ( const wxColour& col ) const; - bool operator != ( const wxColour& col ) const { return !(*this == col); } - - void Set( unsigned char red, unsigned char green, unsigned char blue ); - void Set( unsigned long colRGB ) - { - // We don't need to know sizeof(long) here because we assume that the three - // least significant bytes contain the R, G and B values - Set((unsigned char)colRGB, - (unsigned char)(colRGB >> 8), - (unsigned char)(colRGB >> 16)); - } + bool operator==(const wxColour& col) const; + bool operator!=(const wxColour& col) const { return !(*this == col); } unsigned char Red() const; unsigned char Green() const; @@ -88,18 +55,17 @@ public: unsigned long GetPixel() const; WXColor *GetColor() const; - void InitFromName(const wxString& colourName); - 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); + + virtual bool FromString(const wxString& str); private: DECLARE_DYNAMIC_CLASS(wxColour) }; -#endif - -// _WX_COLOUR_H_ +#endif // _WX_COLOUR_H_