X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f8855e47254a28f5141524b3aaaac03c2944e997..333e57d578e9e0fb6555452b5a53698ffd85ee69:/include/wx/gtk/colour.h diff --git a/include/wx/gtk/colour.h b/include/wx/gtk/colour.h index c575cc5435..88ac82e688 100644 --- a/include/wx/gtk/colour.h +++ b/include/wx/gtk/colour.h @@ -7,92 +7,56 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __GTKCOLOURH__ -#define __GTKCOLOURH__ - -#include "wx/defs.h" -#include "wx/object.h" -#include "wx/string.h" -#include "wx/gdiobj.h" -#include "wx/palette.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDC; -class WXDLLIMPEXP_CORE wxPaintDC; -class WXDLLIMPEXP_CORE wxBitmap; -class WXDLLIMPEXP_CORE wxWindow; - -class WXDLLIMPEXP_CORE wxColour; +#ifndef _WX_GTK_COLOUR_H_ +#define _WX_GTK_COLOUR_H_ //----------------------------------------------------------------------------- // wxColour //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxColour: public wxGDIObject +class WXDLLIMPEXP_CORE wxColour : public wxColourBase { public: // constructors // ------------ // default - wxColour() { } + wxColour() {} + DEFINE_STD_WXCOLOUR_CONSTRUCTORS + wxColour(const GdkColor& gdkColor); - // from separate RGB - wxColour( unsigned char red, unsigned char green, unsigned char blue ); + virtual ~wxColour(); - // 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 - - ~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); + unsigned char Alpha() const; // Implementation part void CalcPixel( GdkColormap *cmap ); int GetPixel() const; +#ifdef __WXGTK24__ + const GdkColor *GetColor() const; +#else + // GDK functions from old gtk2 versions take non-const color parameters, + // too many uses to deal with individually GdkColor *GetColor() const; - - void InitFromName(const wxString& colourName); +#endif 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); + virtual bool FromString(const wxString& str); private: DECLARE_DYNAMIC_CLASS(wxColour) }; -#endif // __GTKCOLOURH__ +#endif // _WX_GTK_COLOUR_H_