Replace gtk_misc_set_padding() with GtkWidget:margin properties

[~andy/gtk] / tests / testgtk.c

diff --git a/tests/testgtk.c b/tests/testgtk.c
index bfe4b77263561f7abe8e3b778140e6312273cf27..6aa7696f972015395c786e5482ef59b8ed039218 100644 (file)
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -2632,7 +2632,8 @@ create_saved_position (GtkWidget *widget)
       gtk_container_add (GTK_CONTAINER (window), main_vbox);
 
       vbox =
-       g_object_new (gtk_vbox_get_type (),
+       g_object_new (GTK_TYPE_BOX,
+                      "orientation", GTK_ORIENTATION_VERTICAL,
                        "GtkBox::homogeneous", FALSE,
                        "GtkBox::spacing", 5,
                        "GtkContainer::border_width", 10,
@@ -2835,7 +2836,8 @@ create_tooltips (GtkWidget *widget)
       gtk_widget_set_tooltip_text (toggle, "Toggle TipsQuery view.");
 
       box3 =
-       g_object_new (gtk_vbox_get_type (),
+       g_object_new (GTK_TYPE_BOX,
+                      "orientation", GTK_ORIENTATION_VERTICAL,
                        "homogeneous", FALSE,
                        "spacing", 5,
                        "border_width", 5,
@@ -3269,7 +3271,8 @@ create_menus (GtkWidget *widget)
       menuitem = gtk_image_menu_item_new_with_label ("Help");
       gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
       gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), create_menu (screen, 4, 5, TRUE));
-      gtk_menu_item_set_right_justified (GTK_MENU_ITEM (menuitem), TRUE);
+      gtk_widget_set_hexpand (menuitem, TRUE);
+      gtk_widget_set_halign (menuitem, GTK_ALIGN_END);
       gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
       gtk_widget_show (menuitem);
       
@@ -4829,7 +4832,7 @@ cursor_draw (GtkWidget *widget,
 {
   int width, height;
   GtkStyleContext *context;
-  GdkRGBA *bg;
+  GdkRGBA bg;
 
   width = gtk_widget_get_allocated_width (widget);
   height = gtk_widget_get_allocated_height (widget);
@@ -4843,9 +4846,8 @@ cursor_draw (GtkWidget *widget,
   cairo_fill (cr);
 
   context = gtk_widget_get_style_context (widget);
-  gtk_style_context_get (context, 0, "background-color", &bg, NULL);
-  gdk_cairo_set_source_rgba (cr, bg);
-  gdk_rgba_free (bg);
+  gtk_style_context_get_background_color (context, GTK_STATE_FLAG_NORMAL, &bg);
+  gdk_cairo_set_source_rgba (cr, &bg);
   cairo_rectangle (cr, width / 3, height / 3, width / 3, height / 3);
   cairo_fill (cr);
 
@@ -4960,7 +4962,8 @@ create_cursors (GtkWidget *widget)
       gtk_container_add (GTK_CONTAINER (window), main_vbox);
 
       vbox =
-       g_object_new (gtk_vbox_get_type (),
+       g_object_new (GTK_TYPE_BOX,
+                      "orientation", GTK_ORIENTATION_VERTICAL,
                        "GtkBox::homogeneous", FALSE,
                        "GtkBox::spacing", 5,
                        "GtkContainer::border_width", 10,
@@ -5496,7 +5499,7 @@ label_toggle (GtkWidget  *widget,
                        "destroy",
                        G_CALLBACK (gtk_widget_destroyed),
                        label);
-      gtk_misc_set_padding (GTK_MISC (*label), 10, 10);
+      g_object_set (*label, "margin", 10, NULL);
       gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog_window))),
                          *label, TRUE, TRUE, 0);
       gtk_widget_show (*label);
@@ -6118,7 +6121,10 @@ create_pages (GtkNotebook *notebook, gint start, gint end)
       g_object_set_data (G_OBJECT (child), "tab_pixmap", pixwid);
                           
       gtk_box_pack_start (GTK_BOX (label_box), pixwid, FALSE, TRUE, 0);
-      gtk_misc_set_padding (GTK_MISC (pixwid), 3, 1);
+      gtk_widget_set_margin_left (pixwid, 3);
+      gtk_widget_set_margin_right (pixwid, 3);
+      gtk_widget_set_margin_bottom (pixwid, 1);
+      gtk_widget_set_margin_top (pixwid, 1);
       label = gtk_label_new_with_mnemonic (accel_buffer);
       gtk_box_pack_start (GTK_BOX (label_box), label, FALSE, TRUE, 0);
       gtk_widget_show_all (label_box);
@@ -6129,7 +6135,10 @@ create_pages (GtkNotebook *notebook, gint start, gint end)
       g_object_set_data (G_OBJECT (child), "menu_pixmap", pixwid);
       
       gtk_box_pack_start (GTK_BOX (menu_box), pixwid, FALSE, TRUE, 0);
-      gtk_misc_set_padding (GTK_MISC (pixwid), 3, 1);
+      gtk_widget_set_margin_left (pixwid, 3);
+      gtk_widget_set_margin_right (pixwid, 3);
+      gtk_widget_set_margin_bottom (pixwid, 1);
+      gtk_widget_set_margin_top (pixwid, 1);
       label = gtk_label_new (buffer);
       gtk_box_pack_start (GTK_BOX (menu_box), label, FALSE, TRUE, 0);
       gtk_widget_show_all (menu_box);
@@ -8233,8 +8242,11 @@ static void
 destroy_progress (GtkWidget     *widget,
                  ProgressData **pdata)
 {
-  g_source_remove ((*pdata)->timer);
-  (*pdata)->timer = 0;
+  if ((*pdata)->timer)
+    {
+      g_source_remove ((*pdata)->timer);
+      (*pdata)->timer = 0;
+    }
   (*pdata)->window = NULL;
   g_free (*pdata);
   *pdata = NULL;
@@ -8291,6 +8303,24 @@ toggle_activity_mode (GtkWidget *widget, ProgressData *pdata)
   pdata->activity = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
 }
 
+static void
+toggle_running (GtkWidget *widget, ProgressData *pdata)
+{
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
+    {
+      if (pdata->timer == 0)
+        pdata->timer = g_timeout_add (100, (GSourceFunc)progress_timeout, pdata);
+    }
+  else
+    {
+      if (pdata->timer != 0)
+        {
+          g_source_remove (pdata->timer);
+          pdata->timer = 0;
+        }
+    }
+}
+
 static void
 entry_changed (GtkWidget *widget, ProgressData *pdata)
 {
@@ -8369,7 +8399,6 @@ create_progress_bar (GtkWidget *widget)
                                       PANGO_ELLIPSIZE_MIDDLE);
 
       gtk_container_add (GTK_CONTAINER (align), pdata->pbar);
-      pdata->timer = g_timeout_add (100, (GSourceFunc)progress_timeout, pdata);
 
       align = gtk_alignment_new (0.5, 0.5, 0, 0);
       gtk_box_pack_start (GTK_BOX (vbox2), align, FALSE, FALSE, 5);
@@ -8405,16 +8434,25 @@ create_progress_bar (GtkWidget *widget)
                        5, 5);
       gtk_box_pack_start (GTK_BOX (hbox), pdata->omenu1, TRUE, TRUE, 0);
       
+      check = gtk_check_button_new_with_label ("Running");
+      g_signal_connect (check, "toggled",
+                       G_CALLBACK (toggle_running),
+                       pdata);
+      gtk_table_attach (GTK_TABLE (tab), check, 0, 2, 1, 2,
+                       GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL,
+                       5, 5);
+      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), TRUE);
+
       check = gtk_check_button_new_with_label ("Show text");
       g_signal_connect (check, "clicked",
                        G_CALLBACK (toggle_show_text),
                        pdata);
-      gtk_table_attach (GTK_TABLE (tab), check, 0, 1, 1, 2,
+      gtk_table_attach (GTK_TABLE (tab), check, 0, 1, 2, 3,
                        GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL,
                        5, 5);
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-      gtk_table_attach (GTK_TABLE (tab), hbox, 1, 2, 1, 2,
+      gtk_table_attach (GTK_TABLE (tab), hbox, 1, 2, 2, 3,
                        GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL,
                        5, 5);
 
@@ -9316,7 +9354,7 @@ create_timeout_test (GtkWidget *widget)
       gtk_container_set_border_width (GTK_CONTAINER (window), 0);
 
       label = gtk_label_new ("count: 0");
-      gtk_misc_set_padding (GTK_MISC (label), 10, 10);
+      g_object_set (label, "margin", 10, NULL);
       gtk_box_pack_start (GTK_BOX (content_area), label, TRUE, TRUE, 0);
       gtk_widget_show (label);
 
@@ -9438,7 +9476,7 @@ create_idle_test (GtkWidget *widget)
       gtk_container_set_border_width (GTK_CONTAINER (window), 0);
 
       label = gtk_label_new ("count: 0");
-      gtk_misc_set_padding (GTK_MISC (label), 10, 10);
+      g_object_set (label, "margin", 10, NULL);
       gtk_widget_show (label);
       
       container =
@@ -9635,7 +9673,7 @@ create_mainloop (GtkWidget *widget)
       action_area = gtk_dialog_get_action_area (GTK_DIALOG (window));
 
       label = gtk_label_new ("In recursive main loop...");
-      gtk_misc_set_padding (GTK_MISC(label), 20, 20);
+      g_object_set (label, "margin", 20, NULL);
 
       gtk_box_pack_start (GTK_BOX (content_area), label, TRUE, TRUE, 0);
       gtk_widget_show (label);