X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b7cacb43db1e69b87b257a67912b4d52995b070a..d642db66a5efc82d374b813022c72ba88bc50839:/include/wx/gtk/colour.h diff --git a/include/wx/gtk/colour.h b/include/wx/gtk/colour.h index 01b49c45aa..98287139fd 100644 --- a/include/wx/gtk/colour.h +++ b/include/wx/gtk/colour.h @@ -10,6 +10,10 @@ #ifndef _WX_GTK_COLOUR_H_ #define _WX_GTK_COLOUR_H_ +#ifdef __WXGTK3__ +typedef struct _GdkRGBA GdkRGBA; +#endif + //----------------------------------------------------------------------------- // wxColour //----------------------------------------------------------------------------- @@ -19,19 +23,16 @@ 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 virtual ~wxColour(); - 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); } + bool operator==(const wxColour& col) const; + bool operator!=(const wxColour& col) const { return !(*this == col); } unsigned char Red() const; unsigned char Green() const; @@ -39,23 +40,20 @@ public: unsigned char Alpha() const; // Implementation part +#ifdef __WXGTK3__ + operator const GdkRGBA*() const; +#else 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; #endif + const GdkColor *GetColor() const; protected: virtual void InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a); - virtual bool FromString(const wxChar *str); + virtual bool FromString(const wxString& str); -private: DECLARE_DYNAMIC_CLASS(wxColour) };