]> Pileus Git - ~andy/gtk/commitdiff
Use new 2.14 GtkColorSelection API in testgtk
authorChristian Dywan <christian@twotoasts.de>
Tue, 6 Apr 2010 15:45:56 +0000 (17:45 +0200)
committerJavier Jardón <jjardon@gnome.org>
Sun, 2 May 2010 23:51:22 +0000 (01:51 +0200)
tests/testgtk.c

index dc65301028ea2336d9675161b5e6122c1d75a49c..26a9a23dceb403e4ebfb4f0d02c1c7143874010f 100644 (file)
@@ -5692,24 +5692,25 @@ void
 color_selection_ok (GtkWidget               *w,
                     GtkColorSelectionDialog *cs)
 {
-  GtkColorSelection *colorsel;
-  gdouble color[4];
+  GtkWidget *colorsel;
+  GdkColor color;
 
-  colorsel=GTK_COLOR_SELECTION(cs->colorsel);
+  colorsel = gtk_color_selection_dialog_get_color_selection (cs);
 
-  gtk_color_selection_get_color(colorsel,color);
-  gtk_color_selection_set_color(colorsel,color);
+  gtk_color_selection_get_current_color (GTK_COLOR_SELECTION (colorsel), &color);
+  gtk_color_selection_set_current_color (GTK_COLOR_SELECTION (colorsel), &color);
 }
 
 void
 color_selection_changed (GtkWidget *w,
                          GtkColorSelectionDialog *cs)
 {
-  GtkColorSelection *colorsel;
-  gdouble color[4];
+  GtkWidget *colorsel;
+  GdkColor color;
 
-  colorsel=GTK_COLOR_SELECTION(cs->colorsel);
-  gtk_color_selection_get_color(colorsel,color);
+  colorsel = gtk_color_selection_dialog_get_color_selection (cs);
+  gtk_color_selection_get_current_color (GTK_COLOR_SELECTION (colorsel), &color);
+  gtk_color_selection_set_current_color (GTK_COLOR_SELECTION (colorsel), &color);
 }
 
 #if 0 /* unused */