X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/40989e46b86777dd211faeb3e5d2366cdcc6d8cd..616c0d1f3ac084bb92f0a75dc48812e8647f1b22:/include/wx/gtk/colour.h?ds=inline diff --git a/include/wx/gtk/colour.h b/include/wx/gtk/colour.h index 87004ed23a..98287139fd 100644 --- a/include/wx/gtk/colour.h +++ b/include/wx/gtk/colour.h @@ -7,25 +7,12 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __GTKCOLOURH__ -#define __GTKCOLOURH__ +#ifndef _WX_GTK_COLOUR_H_ +#define _WX_GTK_COLOUR_H_ -#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; +#ifdef __WXGTK3__ +typedef struct _GdkRGBA GdkRGBA; +#endif //----------------------------------------------------------------------------- // wxColour @@ -36,38 +23,38 @@ class WXDLLIMPEXP_CORE wxColour : public wxColourBase public: // constructors // ------------ - - // default - wxColour() {} DEFINE_STD_WXCOLOUR_CONSTRUCTORS + wxColour(const GdkColor& gdkColor); +#ifdef __WXGTK3__ + wxColour(const GdkRGBA& gdkRGBA); +#endif - ~wxColour(); - - virtual bool FromString(const wxChar *str); - - 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; unsigned char Blue() const; + unsigned char Alpha() const; // Implementation part +#ifdef __WXGTK3__ + operator const GdkRGBA*() const; +#else void CalcPixel( GdkColormap *cmap ); int GetPixel() const; - GdkColor *GetColor() const; +#endif + const GdkColor *GetColor() const; 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 void InitWith( unsigned char red, unsigned char green, unsigned char blue ); + virtual bool FromString(const wxString& str); -private: DECLARE_DYNAMIC_CLASS(wxColour) }; -#endif // __GTKCOLOURH__ +#endif // _WX_GTK_COLOUR_H_