GNOME.org
 

[goocanvas/wip/murrayc/gtk4: 2/2] gtk4: Replace calls to gtk_container_set_border_width().

commit 41f33b0a1288bb97aeaac43c0cb7d701e3fe7340
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Dec 16 09:23:46 2016 +0100

    gtk4: Replace calls to gtk_container_set_border_width().
    
    By setting the special GtkWidget "margin" property, which sets
    all 4 margins. I don't know why there is no gtk_widget_set_margin().
    
    This is what has been done to the GTK+ demos. For instance:
    Removal:
    
https://git.gnome.org/browse/gtk+/commit/demos/gtk-demo/combobox.c?id=4df6ddad54d2cb6ebfdcbf2b6fee35ec4fa760b9
    Replacement:
    
https://git.gnome.org/browse/gtk+/commit/demos/gtk-demo/combobox.c?id=50a75b37a966ea60962967e46fad7fbf5603e7a8

 demo/demo-animation.c           |    2 +-
 demo/demo-arrowhead.c           |    2 +-
 demo/demo-clipping.c            |    2 +-
 demo/demo-events.c              |    2 +-
 demo/demo-features.c            |    2 +-
 demo/demo-fifteen.c             |    2 +-
 demo/demo-focus.c               |    2 +-
 demo/demo-grabs.c               |    4 ++--
 demo/demo-large-items.c         |    2 +-
 demo/demo-scalability.c         |    2 +-
 demo/demo-table.c               |    2 +-
 demo/demo.c                     |    2 +-
 demo/generic-position-demo.c    |    2 +-
 demo/mv-demo-animation.c        |    2 +-
 demo/mv-demo-arrowhead.c        |    2 +-
 demo/mv-demo-clipping.c         |    2 +-
 demo/mv-demo-features.c         |    2 +-
 demo/mv-demo-fifteen.c          |    2 +-
 demo/mv-demo-focus.c            |    2 +-
 demo/mv-demo-grabs.c            |    4 ++--
 demo/mv-demo-paths.c            |    2 +-
 demo/mv-demo-scalability.c      |    2 +-
 demo/mv-demo-table.c            |    2 +-
 demo/mv-demo.c                  |    2 +-
 demo/mv-generic-position-demo.c |    2 +-
 demo/mv-table-demo.c            |    2 +-
 demo/units-demo.c               |    2 +-
 demo/widgets-demo.c             |    2 +-
 28 files changed, 30 insertions(+), 30 deletions(-)
---
diff --git a/demo/demo-animation.c b/demo/demo-animation.c
index b0e419f..6fe0bd7 100644
--- a/demo/demo-animation.c
+++ b/demo/demo-animation.c
@@ -114,7 +114,7 @@ create_animation_page (void)
   GtkWidget *vbox, *hbox, *w, *scrolled_win, *canvas;
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
-  gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
+  g_object_set (vbox, "margin", 4, NULL);
   gtk_widget_show (vbox);
 
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
diff --git a/demo/demo-arrowhead.c b/demo/demo-arrowhead.c
index 2447cea..de51b13 100644
--- a/demo/demo-arrowhead.c
+++ b/demo/demo-arrowhead.c
@@ -414,7 +414,7 @@ create_canvas_arrowhead (void)
        GooCanvasItem *root, *item;
 
        vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
-       gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
+       g_object_set (vbox, "margin", 4, NULL);
        gtk_widget_show (vbox);
 
        w = gtk_label_new ("This demo allows you to edit arrowhead shapes.  Drag the little boxes\n"
diff --git a/demo/demo-clipping.c b/demo/demo-clipping.c
index 2219a5c..1f7b252 100644
--- a/demo/demo-clipping.c
+++ b/demo/demo-clipping.c
@@ -138,7 +138,7 @@ create_clipping_page (void)
   GtkWidget *vbox, *scrolled_win, *canvas;
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
-  gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
+  g_object_set (vbox, "margin", 4, NULL);
   gtk_widget_show (vbox);
 
   scrolled_win = gtk_scrolled_window_new (NULL, NULL);
diff --git a/demo/demo-events.c b/demo/demo-events.c
index ab954d7..c50c908 100644
--- a/demo/demo-events.c
+++ b/demo/demo-events.c
@@ -130,7 +130,7 @@ create_events_page (void)
   GtkWidget *vbox, *frame, *label, *canvas;
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
-  gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
+  g_object_set (vbox, "margin", 4, NULL);
   gtk_widget_show (vbox);
 
   /* Instructions */
diff --git a/demo/demo-features.c b/demo/demo-features.c
index 7e1ef9b..77079db 100644
--- a/demo/demo-features.c
+++ b/demo/demo-features.c
@@ -52,7 +52,7 @@ create_canvas_features (void)
        GooCanvasItem *group;
 
        vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
-       gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
+       g_object_set (vbox, "margin", 4, NULL);
        gtk_widget_show (vbox);
 
        /* Instructions */
diff --git a/demo/demo-fifteen.c b/demo/demo-fifteen.c
index 5590cce..d4e783c 100644
--- a/demo/demo-fifteen.c
+++ b/demo/demo-fifteen.c
@@ -243,7 +243,7 @@ create_canvas_fifteen (void)
        char buf[20];
 
        vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
-       gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
+       g_object_set (vbox, "margin", 4, NULL);
        gtk_widget_show (vbox);
 
        frame = gtk_frame_new (NULL);
diff --git a/demo/demo-focus.c b/demo/demo-focus.c
index 3b8a3e4..f441f06 100644
--- a/demo/demo-focus.c
+++ b/demo/demo-focus.c
@@ -139,7 +139,7 @@ create_focus_page (void)
   GtkWidget *vbox, *label, *scrolled_win, *canvas;
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
-  gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
+  g_object_set (vbox, "margin", 4, NULL);
   gtk_widget_show (vbox);
 
   label = gtk_label_new ("Use Tab, Shift+Tab or the arrow keys to move the keyboard focus between the canvas 
items.");
diff --git a/demo/demo-grabs.c b/demo/demo-grabs.c
index cfe11e0..d62e374 100644
--- a/demo/demo-grabs.c
+++ b/demo/demo-grabs.c
@@ -400,7 +400,7 @@ create_grabs_page (void)
   GtkWidget *vbox, *grid, *label;
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
-  gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
+  g_object_set (vbox, "margin", 4, NULL);
   gtk_widget_show (vbox);
 
   label = gtk_label_new ("Move the mouse over the widgets and canvas items on the right to see what events 
they receive.\nClick buttons to start explicit or implicit pointer grabs and see what events they receive 
now.\n(They should all receive the same events.)");
@@ -408,7 +408,7 @@ create_grabs_page (void)
   gtk_widget_show (label);
 
   grid = gtk_grid_new ();
-  gtk_container_set_border_width (GTK_CONTAINER (grid), 12);
+  g_object_set (grid, "margin", 12, NULL);
   gtk_grid_set_row_spacing (GTK_GRID (grid), 12);
   gtk_grid_set_column_spacing (GTK_GRID (grid), 12);
   gtk_box_pack_start (GTK_BOX (vbox), grid, FALSE, FALSE);
diff --git a/demo/demo-large-items.c b/demo/demo-large-items.c
index 194e807..245a85e 100644
--- a/demo/demo-large-items.c
+++ b/demo/demo-large-items.c
@@ -67,7 +67,7 @@ create_large_items_page (void)
   gchar *text;
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
-  gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
+  g_object_set (vbox, "margin", 4, NULL);
   gtk_widget_show (vbox);
 
   text = g_strdup_printf ("This is a very large canvas, from (%i, %i) to (%i, %i).\nThe maximum zoom is %i. 
At this scale the canvas comes very close to the GDK window size limit (32-bit gint).\nThe items have been 
specially written to work around cairo's limits (transformed coords must be < +/- 32768).",
diff --git a/demo/demo-scalability.c b/demo/demo-scalability.c
index 672be72..0dcbe8c 100644
--- a/demo/demo-scalability.c
+++ b/demo/demo-scalability.c
@@ -22,7 +22,7 @@ create_canvas_scalability (void)
        int i, j, width, height;
 
        vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
-       gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
+       g_object_set (vbox, "margin", 4, NULL);
        gtk_widget_show (vbox);
 
        /* Create the canvas and board */
diff --git a/demo/demo-table.c b/demo/demo-table.c
index c4609f3..b08305a 100644
--- a/demo/demo-table.c
+++ b/demo/demo-table.c
@@ -381,7 +381,7 @@ create_table_page (void)
   GooCanvasItem *root, *table;
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
-  gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
+  g_object_set (vbox, "margin", 4, NULL);
   gtk_widget_show (vbox);
 
   scrolled_win = gtk_scrolled_window_new (NULL, NULL);
diff --git a/demo/demo.c b/demo/demo.c
index 1203184..a2fa532 100644
--- a/demo/demo.c
+++ b/demo/demo.c
@@ -474,7 +474,7 @@ create_canvas_primitives ()
        GSList *group = NULL;
 
        vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
-       gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
+       g_object_set (vbox, "margin", 4, NULL);
        gtk_widget_show (vbox);
 
        w = gtk_label_new ("Drag an item with button 1.  Click button 2 on an item to lower it, or button 3 
to raise it.");
diff --git a/demo/generic-position-demo.c b/demo/generic-position-demo.c
index ee59bfd..5e89f16 100644
--- a/demo/generic-position-demo.c
+++ b/demo/generic-position-demo.c
@@ -186,7 +186,7 @@ main (int argc, char *argv[])
   g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
-  gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
+  g_object_set (vbox, "margin", 4, NULL);
   gtk_widget_show (vbox);
   gtk_container_add (GTK_CONTAINER (window), vbox);
 
diff --git a/demo/mv-demo-animation.c b/demo/mv-demo-animation.c
index 6693751..9be1dff 100644
--- a/demo/mv-demo-animation.c
+++ b/demo/mv-demo-animation.c
@@ -113,7 +113,7 @@ create_animation_page (void)
   GooCanvasItemModel *root;
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
-  gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
+  g_object_set (vbox, "margin", 4, NULL);
   gtk_widget_show (vbox);
 
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
diff --git a/demo/mv-demo-arrowhead.c b/demo/mv-demo-arrowhead.c
index 7b37774..1c22a1e 100644
--- a/demo/mv-demo-arrowhead.c
+++ b/demo/mv-demo-arrowhead.c
@@ -429,7 +429,7 @@ create_canvas_arrowhead (void)
        GooCanvasItemModel *root, *item;
 
        vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
-       gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
+       g_object_set (vbox, "margin", 4, NULL);
        gtk_widget_show (vbox);
 
        w = gtk_label_new ("This demo allows you to edit arrowhead shapes.  Drag the little boxes\n"
diff --git a/demo/mv-demo-clipping.c b/demo/mv-demo-clipping.c
index 2d376d4..9fe1242 100644
--- a/demo/mv-demo-clipping.c
+++ b/demo/mv-demo-clipping.c
@@ -152,7 +152,7 @@ create_clipping_page (void)
   GtkWidget *vbox, *scrolled_win, *canvas;
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
-  gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
+  g_object_set (vbox, "margin", 4, NULL);
   gtk_widget_show (vbox);
 
   scrolled_win = gtk_scrolled_window_new (NULL, NULL);
diff --git a/demo/mv-demo-features.c b/demo/mv-demo-features.c
index 2ea90c0..e9bb951 100644
--- a/demo/mv-demo-features.c
+++ b/demo/mv-demo-features.c
@@ -59,7 +59,7 @@ create_canvas_features (void)
        GooCanvasItemModel *group;
 
        vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
-       gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
+       g_object_set (vbox, "margin", 4, NULL);
        gtk_widget_show (vbox);
 
        /* Instructions */
diff --git a/demo/mv-demo-fifteen.c b/demo/mv-demo-fifteen.c
index 1bc0d77..172ef86 100644
--- a/demo/mv-demo-fifteen.c
+++ b/demo/mv-demo-fifteen.c
@@ -254,7 +254,7 @@ create_canvas_fifteen (void)
        char buf[20];
 
        vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
-       gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
+       g_object_set (vbox, "margin", 4, NULL);
        gtk_widget_show (vbox);
 
        frame = gtk_frame_new (NULL);
diff --git a/demo/mv-demo-focus.c b/demo/mv-demo-focus.c
index 05ad8c9..04beb14 100644
--- a/demo/mv-demo-focus.c
+++ b/demo/mv-demo-focus.c
@@ -154,7 +154,7 @@ create_focus_page (void)
   GtkWidget *vbox, *label, *scrolled_win, *canvas;
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
-  gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
+  g_object_set (vbox, "margin", 4, NULL);
   gtk_widget_show (vbox);
 
   label = gtk_label_new ("Use Tab, Shift+Tab or the arrow keys to move the keyboard focus between the canvas 
items.");
diff --git a/demo/mv-demo-grabs.c b/demo/mv-demo-grabs.c
index 6132c5b..4a39953 100644
--- a/demo/mv-demo-grabs.c
+++ b/demo/mv-demo-grabs.c
@@ -412,7 +412,7 @@ create_grabs_page (void)
   GtkWidget *vbox, *grid, *label;
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
-  gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
+  g_object_set (vbox, "margin", 4, NULL);
   gtk_widget_show (vbox);
 
   label = gtk_label_new ("Move the mouse over the widgets and canvas items on the right to see what events 
they receive.\nClick buttons to start explicit or implicit pointer grabs and see what events they receive 
now.\n(They should all receive the same events.)");
@@ -420,7 +420,7 @@ create_grabs_page (void)
   gtk_widget_show (label);
 
   grid = gtk_grid_new ();
-  gtk_container_set_border_width (GTK_CONTAINER (grid), 12);
+  g_object_set (grid, "margin", 12, NULL);
   gtk_grid_set_row_spacing (GTK_GRID (grid), 12);
   gtk_grid_set_column_spacing (GTK_GRID (grid), 12);
   gtk_box_pack_start (GTK_BOX (vbox), grid, FALSE, FALSE);
diff --git a/demo/mv-demo-paths.c b/demo/mv-demo-paths.c
index 9800b22..5246da5 100644
--- a/demo/mv-demo-paths.c
+++ b/demo/mv-demo-paths.c
@@ -129,7 +129,7 @@ create_paths_page (void)
   GooCanvasItemModel *root;
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
-  gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
+  g_object_set (vbox, "margin", 4, NULL);
   gtk_widget_show (vbox);
 
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
diff --git a/demo/mv-demo-scalability.c b/demo/mv-demo-scalability.c
index fd5c9d1..3225b36 100644
--- a/demo/mv-demo-scalability.c
+++ b/demo/mv-demo-scalability.c
@@ -22,7 +22,7 @@ create_canvas_scalability (void)
        int i, j, width, height;
 
        vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
-       gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
+       g_object_set (vbox, "margin", 4, NULL);
        gtk_widget_show (vbox);
 
        /* Create the canvas and board */
diff --git a/demo/mv-demo-table.c b/demo/mv-demo-table.c
index 17149d2..3892559 100644
--- a/demo/mv-demo-table.c
+++ b/demo/mv-demo-table.c
@@ -384,7 +384,7 @@ create_table_page (void)
   GooCanvasItemModel *root, *table;
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
-  gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
+  g_object_set (vbox, "margin", 4, NULL);
   gtk_widget_show (vbox);
 
   scrolled_win = gtk_scrolled_window_new (NULL, NULL);
diff --git a/demo/mv-demo.c b/demo/mv-demo.c
index 2f46ddd..4ba1eca 100644
--- a/demo/mv-demo.c
+++ b/demo/mv-demo.c
@@ -398,7 +398,7 @@ create_canvas_primitives (GooCanvasItemModel *model,
        GSList *group = NULL;
 
        vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
-       gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
+       g_object_set (vbox, "margin", 4, NULL);
        gtk_widget_show (vbox);
 
        w = gtk_label_new ("Drag an item with button 1.  Click button 2 on an item to lower it, or button 3 
to raise it.");
diff --git a/demo/mv-generic-position-demo.c b/demo/mv-generic-position-demo.c
index 4243523..458e873 100644
--- a/demo/mv-generic-position-demo.c
+++ b/demo/mv-generic-position-demo.c
@@ -187,7 +187,7 @@ create_window (GooCanvasItemModel *model)
   g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
-  gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
+  g_object_set (vbox, "margin", 4, NULL);
   gtk_widget_show (vbox);
   gtk_container_add (GTK_CONTAINER (window), vbox);
 
diff --git a/demo/mv-table-demo.c b/demo/mv-table-demo.c
index 554bd02..f301e9f 100644
--- a/demo/mv-table-demo.c
+++ b/demo/mv-table-demo.c
@@ -230,7 +230,7 @@ main (int argc, char *argv[])
                    NULL);
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
-  gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
+  g_object_set (vbox, "margin", 4, NULL);
   gtk_widget_show (vbox);
   gtk_container_add (GTK_CONTAINER (window), vbox);
 
diff --git a/demo/units-demo.c b/demo/units-demo.c
index 3942033..ef06573 100644
--- a/demo/units-demo.c
+++ b/demo/units-demo.c
@@ -101,7 +101,7 @@ create_canvas (GtkUnit         units,
   GtkAdjustment *adj;
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
-  gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
+  g_object_set (vbox, "margin", 4, NULL);
   gtk_widget_show (vbox);
 
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
diff --git a/demo/widgets-demo.c b/demo/widgets-demo.c
index 99923c2..1fd4543 100644
--- a/demo/widgets-demo.c
+++ b/demo/widgets-demo.c
@@ -282,7 +282,7 @@ main (int argc, char *argv[])
                    NULL);
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
-  gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
+  g_object_set (vbox, "margin", 4, NULL);
   gtk_widget_show (vbox);
   gtk_container_add (GTK_CONTAINER (window), vbox);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]