X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8f884a0dccd6b642f35c441ac9bfc87a6d5b4d35..d642db66a5efc82d374b813022c72ba88bc50839:/include/wx/gtk/colour.h?ds=sidebyside diff --git a/include/wx/gtk/colour.h b/include/wx/gtk/colour.h index 07121726d6..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,11 +23,11 @@ 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(); @@ -36,8 +40,12 @@ public: unsigned char Alpha() const; // Implementation part +#ifdef __WXGTK3__ + operator const GdkRGBA*() const; +#else void CalcPixel( GdkColormap *cmap ); int GetPixel() const; +#endif const GdkColor *GetColor() const; protected: @@ -46,7 +54,6 @@ protected: virtual bool FromString(const wxString& str); -private: DECLARE_DYNAMIC_CLASS(wxColour) };