X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8ef94bfc25eb21f1d3fa93b3d55c5a1ca18d8e62..55fbde1232bff0ed44c23775911574ac1b2f8a0a:/include/wx/gtk1/colour.h diff --git a/include/wx/gtk1/colour.h b/include/wx/gtk1/colour.h index dab437e7b3..8eb61124f3 100644 --- a/include/wx/gtk1/colour.h +++ b/include/wx/gtk1/colour.h @@ -20,18 +20,18 @@ // 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 WXDLLIMPEXP_CORE wxColour: public wxGDIObject +class WXDLLIMPEXP_CORE wxColour : public wxColourBase { public: // constructors @@ -39,63 +39,35 @@ public: // default wxColour() { } + DEFINE_STD_WXCOLOUR_CONSTRUCTORS - // from separate RGB - wxColour( unsigned char red, unsigned char green, unsigned char blue ); + virtual ~wxColour(); - // from packed RGB - wxColour( unsigned long colRGB ) { Set(colRGB); } + virtual bool FromString(const wxString& str); - // 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 - - - wxColour( const wxColour& col ) - : wxGDIObject() - { Ref(col); } - wxColour& operator = ( const wxColour& col ) { Ref(col); return *this; } - - ~wxColour(); - - bool Ok() const { return m_refData != NULL; } + 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); } - 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)); - } - unsigned char Red() const; unsigned char Green() const; unsigned char Blue() const; - // Get colour from name or wxNullColour - static wxColour CreateByName(const wxString& name); - // Implementation part void CalcPixel( GdkColormap *cmap ); int GetPixel() const; GdkColor *GetColor() const; - void InitFromName(const wxString& colourName); - protected: // ref counting code virtual wxObjectRefData *CreateRefData() const; virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; + virtual void + InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a); private: DECLARE_DYNAMIC_CLASS(wxColour)