callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prop-editor: don't use GtkColorButton deprecated API

Browse Source
This commit is contained in:
Cosimo Cecchi
2012-02-09 16:23:05 -05:00
committed by Matthias Clasen
parent 92322a63f5
commit 06b34b3fc1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/prop-editor.c
View File

@ -666,7 +666,7 @@ rgba_modified (GtkColorButton *cb, gpointer data)
ObjectProperty *p = data; ObjectProperty *p = data;
GdkRGBA color; GdkRGBA color;
gtk_color_button_get_rgba (cb, &color); gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (cb), &color);
if (is_child_property (p->spec)) if (is_child_property (p->spec))
{ {
@ -692,12 +692,12 @@ rgba_changed (GObject *object, GParamSpec *pspec, gpointer data)
get_property_value (object, pspec, &val); get_property_value (object, pspec, &val);
color = g_value_get_boxed (&val); color = g_value_get_boxed (&val);
gtk_color_button_get_rgba (cb, &cb_color); gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (cb), &cb_color);
if (color != NULL && !gdk_rgba_equal (color, &cb_color)) if (color != NULL && !gdk_rgba_equal (color, &cb_color))
{ {
block_controller (G_OBJECT (cb)); block_controller (G_OBJECT (cb));
gtk_color_button_set_rgba (cb, color); gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (cb), color);
unblock_controller (G_OBJECT (cb)); unblock_controller (G_OBJECT (cb));
} }
@ -1013,7 +1013,7 @@ property_widget (GObject *object,
G_PARAM_SPEC_VALUE_TYPE (spec) == GDK_TYPE_RGBA) G_PARAM_SPEC_VALUE_TYPE (spec) == GDK_TYPE_RGBA)
{ {
prop_edit = gtk_color_button_new (); prop_edit = gtk_color_button_new ();
gtk_color_button_set_use_alpha (GTK_COLOR_BUTTON (prop_edit), TRUE); gtk_color_chooser_set_use_alpha (GTK_COLOR_CHOOSER (prop_edit), TRUE);
g_object_connect_property (object, spec, g_object_connect_property (object, spec,
G_CALLBACK (rgba_changed), G_CALLBACK (rgba_changed),