]> Pileus Git - ~andy/gtk/commitdiff
gtk-demo: use the new GtkColorChooserDialog in the color demo
authorCosimo Cecchi <cosimoc@gnome.org>
Thu, 9 Feb 2012 21:21:45 +0000 (16:21 -0500)
committerMatthias Clasen <mclasen@redhat.com>
Tue, 14 Feb 2012 21:37:02 +0000 (16:37 -0500)
demos/gtk-demo/colorsel.c

index 8c3fe5e9ca7e7841bdaa83cb308d424d906b1f7a..633e13b9c2c782e7ef4959e069cc9be014061566 100644 (file)
@@ -36,26 +36,17 @@ change_color_callback (GtkWidget *button,
 {
   GtkWidget *dialog;
   GtkColorSelection *colorsel;
-  GtkColorSelectionDialog *selection_dialog;
+  GtkColorChooserDialog *selection_dialog;
   gint response;
 
-  dialog = gtk_color_selection_dialog_new ("Changing color");
-
-  gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (window));
-
-  selection_dialog = GTK_COLOR_SELECTION_DIALOG (dialog);
-  colorsel = GTK_COLOR_SELECTION (gtk_color_selection_dialog_get_color_selection (selection_dialog));
-
-  gtk_color_selection_set_previous_rgba (colorsel, &color);
-  gtk_color_selection_set_current_rgba (colorsel, &color);
-  gtk_color_selection_set_has_palette (colorsel, TRUE);
+  dialog = gtk_color_chooser_dialog_new ("Changing color", GTK_WINDOW (window));
+  gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (dialog), &color);
 
   response = gtk_dialog_run (GTK_DIALOG (dialog));
 
   if (response == GTK_RESPONSE_OK)
     {
-      gtk_color_selection_get_current_rgba (colorsel, &color);
-
+      gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (dialog), &color);
       gtk_widget_override_background_color (da, 0, &color);
     }