gtk-demo: Fix gcc warnings

[~andy/gtk] / demos / gtk-demo / colorsel.c

diff --git a/demos/gtk-demo/colorsel.c b/demos/gtk-demo/colorsel.c
index 3d5d55a2a877df449349d21a2807709729c03167..4cdfeee21c0b12eebc3674e744d2e21e8cd2d046 100644 (file)
--- a/demos/gtk-demo/colorsel.c
+++ b/demos/gtk-demo/colorsel.c
@@ -9,57 +9,54 @@
 
 static GtkWidget *window = NULL;
 static GtkWidget *da;
-static GdkColor color;
+static GdkRGBA color;
 static GtkWidget *frame;
 
-/* Expose callback for the drawing area
+/* draw callback for the drawing area
  */
 static gboolean
-draw_callback (GtkWidget *widget, 
+draw_callback (GtkWidget *widget,
                cairo_t   *cr,
                gpointer   data)
 {
-  GtkStyle *style;
+  GtkStyleContext *context;
+  GdkRGBA rgba;
 
-  style = gtk_widget_get_style (widget);
-
-  gdk_cairo_set_source_color (cr, &style->bg[GTK_STATE_NORMAL]);
+  context = gtk_widget_get_style_context (widget);
+  gtk_style_context_get_background_color (context, GTK_STATE_FLAG_NORMAL, &rgba);
+  gdk_cairo_set_source_rgba (cr, &rgba);
   cairo_paint (cr);
 
   return TRUE;
 }
 
+static void
+response_cb (GtkDialog *dialog,
+             gint       response_id,
+             gpointer   user_data)
+{
+  if (response_id == GTK_RESPONSE_OK)
+    {
+      gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (dialog), &color);
+      gtk_widget_override_background_color (da, 0, &color);
+    }
+}
+
 static void
 change_color_callback (GtkWidget *button,
-                      gpointer   data)
+                       gpointer   data)
 {
   GtkWidget *dialog;
-  GtkColorSelection *colorsel;
-  GtkColorSelectionDialog *selection_dialog;
-  gint response;
-  
-  dialog = gtk_color_selection_dialog_new ("Changing color");
 
-  gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (window));
+  dialog = gtk_color_chooser_dialog_new ("Changing color", GTK_WINDOW (window));
+  gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (dialog), &color);
 
-  selection_dialog = GTK_COLOR_SELECTION_DIALOG (dialog);
-  colorsel = GTK_COLOR_SELECTION (gtk_color_selection_dialog_get_color_selection (selection_dialog));
+  g_signal_connect (dialog,
+                    "response",
+                    G_CALLBACK (response_cb),
+                    NULL);
 
-  gtk_color_selection_set_previous_color (colorsel, &color);
-  gtk_color_selection_set_current_color (colorsel, &color);
-  gtk_color_selection_set_has_palette (colorsel, TRUE);
-  
-  response = gtk_dialog_run (GTK_DIALOG (dialog));
-
-  if (response == GTK_RESPONSE_OK)
-    {
-      gtk_color_selection_get_current_color (colorsel,
-                                            &color);
-      
-      gtk_widget_modify_bg (da, GTK_STATE_NORMAL, &color);
-    }
-  
-  gtk_widget_destroy (dialog);
+  gtk_widget_show_all (dialog);
 }
 
 GtkWidget *
@@ -67,58 +64,56 @@ do_colorsel (GtkWidget *do_widget)
 {
   GtkWidget *vbox;
   GtkWidget *button;
-  GtkWidget *alignment;
-  
+
   if (!window)
     {
       color.red = 0;
-      color.blue = 65535;
+      color.blue = 1;
       color.green = 0;
-      
+      color.alpha = 1;
+
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_window_set_screen (GTK_WINDOW (window),
-                            gtk_widget_get_screen (do_widget));
+                             gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Color Selection");
 
       g_signal_connect (window, "destroy",
-                       G_CALLBACK (gtk_widget_destroyed), &window);
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       gtk_container_set_border_width (GTK_CONTAINER (window), 8);
 
-      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 8);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
       /*
        * Create the color swatch area
        */
-      
-      
+
+
       frame = gtk_frame_new (NULL);
       gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
       gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
 
       da = gtk_drawing_area_new ();
 
-      g_signal_connect (da, "draw",
-                       G_CALLBACK (draw_callback), NULL);
+      g_signal_connect (da, "draw", G_CALLBACK (draw_callback), NULL);
 
       /* set a minimum size */
       gtk_widget_set_size_request (da, 200, 200);
       /* set the color */
-      gtk_widget_modify_bg (da, GTK_STATE_NORMAL, &color);
-      
+      gtk_widget_override_background_color (da, 0, &color);
+
       gtk_container_add (GTK_CONTAINER (frame), da);
 
-      alignment = gtk_alignment_new (1.0, 0.5, 0.0, 0.0);
-      
       button = gtk_button_new_with_mnemonic ("_Change the above color");
-      gtk_container_add (GTK_CONTAINER (alignment), button);
-      
-      gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, FALSE, 0);
-      
+      gtk_widget_set_halign (button, GTK_ALIGN_END);
+      gtk_widget_set_valign (button, GTK_ALIGN_CENTER);
+
+      gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+
       g_signal_connect (button, "clicked",
-                       G_CALLBACK (change_color_callback), NULL);
+                        G_CALLBACK (change_color_callback), NULL);
     }
 
   if (!gtk_widget_get_visible (window))