From b7d7127bfa1b1c2e8d10467087556298cdc77102 Mon Sep 17 00:00:00 2001 From: Wolfgang Ulbrich Date: Sun, 29 Nov 2015 18:10:09 +0100 Subject: GTK3: Do not use deprecated API Namely, we make the following replacements: * GtkStyle -> GtkStyleContext * GdkColor -> GdkRGBA * GtkColorSelectionDialog -> GtkColorChooserDialog taken from....but adjusted: https://git.gnome.org/browse/gnome-system-monitor/commit/?id=7ac1c1c --- src/gsm_color_button.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src/gsm_color_button.h') diff --git a/src/gsm_color_button.h b/src/gsm_color_button.h index bb885bc..bb54f72 100644 --- a/src/gsm_color_button.h +++ b/src/gsm_color_button.h @@ -25,10 +25,9 @@ #include #include #include +#if !GTK_CHECK_VERSION(3,0,0) #include #include -#ifndef RSVG_CAIRO_H -#include #endif G_BEGIN_DECLS @@ -80,11 +79,20 @@ struct _GSMColorButtonClass }; GType gsm_color_button_get_type (void) G_GNUC_CONST; +#if GTK_CHECK_VERSION(3,0,0) +GtkWidget *gsm_color_button_new (const GdkRGBA * color, guint type); +void gsm_color_button_set_color (GSMColorButton * color_button, const GdkRGBA * color); +#else GtkWidget *gsm_color_button_new (const GdkColor * color, guint type); void gsm_color_button_set_color (GSMColorButton * color_button, const GdkColor * color); +#endif void gsm_color_button_set_fraction (GSMColorButton * color_button, const gdouble fraction); void gsm_color_button_set_cbtype (GSMColorButton * color_button, guint type); +#if GTK_CHECK_VERSION(3,0,0) +void gsm_color_button_get_color (GSMColorButton * color_button, GdkRGBA * color); +#else void gsm_color_button_get_color (GSMColorButton * color_button, GdkColor * color); +#endif gdouble gsm_color_button_get_fraction (GSMColorButton * color_button); guint gsm_color_button_get_cbtype (GSMColorButton * color_button); void gsm_color_button_set_title (GSMColorButton * color_button, const gchar * title); -- cgit v1.2.1