AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

API: container: Remove gtk_container_set_border_width()

Browse Source
This commit is contained in:
Benjamin Otte 2016-10-09 02:32:00 +02:00
parent 1518fe0a8f
commit 4df6ddad54
160 changed files with 131 additions and 1127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/gtk-demo/assistant.c
View File

@ -94,7 +94,6 @@ create_page1 (GtkWidget *assistant)
GtkWidget *box, *label, *entry;
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
gtk_container_set_border_width (GTK_CONTAINER (box), 12);
label = gtk_label_new ("You must fill out this entry to continue:");
gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE);
@ -118,7 +117,6 @@ create_page2 (GtkWidget *assistant)
GtkWidget *box, *checkbutton;
box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
gtk_container_set_border_width (GTK_CONTAINER (box), 12);
checkbutton = gtk_check_button_new_with_label ("This is optional data, you may continue "
"even if you do not check this");

1
demos/gtk-demo/blendmodes.ui
View File

@ -11,7 +11,6 @@
<object class="GtkGrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="row_spacing">12</property>
<property name="column_spacing">12</property>
<child>

5
demos/gtk-demo/button_box.c
View File

@ -23,7 +23,6 @@ create_bbox (gint horizontal,
else
bbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
gtk_container_set_border_width (GTK_CONTAINER (bbox), 5);
gtk_container_add (GTK_CONTAINER (frame), bbox);
gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), layout);
@ -62,8 +61,6 @@ do_button_box (GtkWidget *do_widget)
G_CALLBACK (gtk_widget_destroyed),
&window);
gtk_container_set_border_width (GTK_CONTAINER (window), 10);
main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add (GTK_CONTAINER (window), main_vbox);
@ -73,7 +70,6 @@ do_button_box (GtkWidget *do_widget)
gtk_box_pack_start (GTK_BOX (main_vbox), frame_horz, TRUE, TRUE);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
gtk_container_add (GTK_CONTAINER (frame_horz), vbox);
gtk_box_pack_start (GTK_BOX (vbox),
@ -104,7 +100,6 @@ do_button_box (GtkWidget *do_widget)
gtk_box_pack_start (GTK_BOX (main_vbox), frame_vert, TRUE, TRUE);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 10);
gtk_container_add (GTK_CONTAINER (frame_vert), hbox);
gtk_box_pack_start (GTK_BOX (hbox),

2
demos/gtk-demo/changedisplay.c
View File

@ -305,7 +305,6 @@ create_frame (ChangeDisplayInfo *info,
*frame = gtk_frame_new (title);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
gtk_container_add (GTK_CONTAINER (*frame), hbox);
scrollwin = gtk_scrolled_window_new (NULL, NULL);
@ -539,7 +538,6 @@ do_changedisplay (GtkWidget *do_widget)
content_area = gtk_dialog_get_content_area (GTK_DIALOG (info->window));
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE);
frame = create_display_frame (info);

4
demos/gtk-demo/clipboard.c
View File

@ -219,7 +219,6 @@ do_clipboard (GtkWidget *do_widget)
G_CALLBACK (gtk_widget_destroyed), &window);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
gtk_container_add (GTK_CONTAINER (window), vbox);
@ -228,7 +227,6 @@ do_clipboard (GtkWidget *do_widget)
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
/* Create the first entry */
@ -245,7 +243,6 @@ do_clipboard (GtkWidget *do_widget)
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
/* Create the second entry */
@ -262,7 +259,6 @@ do_clipboard (GtkWidget *do_widget)
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
/* Create the first image */

3
demos/gtk-demo/colorsel.c
View File

@ -74,10 +74,7 @@ do_colorsel (GtkWidget *do_widget)
g_signal_connect (window, "destroy",
G_CALLBACK (gtk_widget_destroyed), &window);
gtk_container_set_border_width (GTK_CONTAINER (window), 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);
/*

6
demos/gtk-demo/combobox.c
View File

@ -318,8 +318,6 @@ do_combobox (GtkWidget *do_widget)
g_signal_connect (window, "destroy",
G_CALLBACK (gtk_widget_destroyed), &window);
gtk_container_set_border_width (GTK_CONTAINER (window), 10);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
gtk_container_add (GTK_CONTAINER (window), vbox);
@ -330,7 +328,6 @@ do_combobox (GtkWidget *do_widget)
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_set_border_width (GTK_CONTAINER (box), 5);
gtk_container_add (GTK_CONTAINER (frame), box);
model = create_icon_store ();
@ -371,7 +368,6 @@ do_combobox (GtkWidget *do_widget)
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_set_border_width (GTK_CONTAINER (box), 5);
gtk_container_add (GTK_CONTAINER (frame), box);
model = create_capital_store ();
@ -399,7 +395,6 @@ do_combobox (GtkWidget *do_widget)
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_set_border_width (GTK_CONTAINER (box), 5);
gtk_container_add (GTK_CONTAINER (frame), box);
combo = gtk_combo_box_text_new_with_entry ();
@ -417,7 +412,6 @@ do_combobox (GtkWidget *do_widget)
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_set_border_width (GTK_CONTAINER (box), 5);
gtk_container_add (GTK_CONTAINER (frame), box);
combo = gtk_combo_box_text_new ();

4
demos/gtk-demo/dialog.c
View File

@ -56,7 +56,6 @@ interactive_dialog_clicked (GtkButton *button,
content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE);
image = gtk_image_new_from_icon_name ("dialog-question", GTK_ICON_SIZE_DIALOG);
@ -114,13 +113,10 @@ do_dialog (GtkWidget *do_widget)
g_signal_connect (window, "destroy",
G_CALLBACK (gtk_widget_destroyed), &window);
gtk_container_set_border_width (GTK_CONTAINER (window), 8);
frame = gtk_frame_new ("Dialogs");
gtk_container_add (GTK_CONTAINER (window), frame);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
gtk_container_add (GTK_CONTAINER (frame), vbox);
/* Standard message dialog */

3
demos/gtk-demo/drawingarea.c
View File

@ -215,10 +215,7 @@ do_drawingarea (GtkWidget *do_widget)
g_signal_connect (window, "destroy",
G_CALLBACK (close_window), NULL);
gtk_container_set_border_width (GTK_CONTAINER (window), 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);
/*

1
demos/gtk-demo/editable_cells.c
View File

@ -349,7 +349,6 @@ do_editable_cells (GtkWidget *do_widget)
gtk_window_set_screen (GTK_WINDOW (window),
gtk_widget_get_screen (do_widget));
gtk_window_set_title (GTK_WINDOW (window), "Editable Cells");
gtk_container_set_border_width (GTK_CONTAINER (window), 5);
g_signal_connect (window, "destroy",
G_CALLBACK (gtk_widget_destroyed), &window);

1
demos/gtk-demo/entry_buffer.c
View File

@ -29,7 +29,6 @@ do_entry_buffer (GtkWidget *do_widget)
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
gtk_container_add (GTK_CONTAINER (window), vbox);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
label = gtk_label_new (NULL);
gtk_label_set_markup (GTK_LABEL (label),

1
demos/gtk-demo/entry_completion.c
View File

@ -56,7 +56,6 @@ do_entry_completion (GtkWidget *do_widget)
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
gtk_container_add (GTK_CONTAINER (window), vbox);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
label = gtk_label_new (NULL);
gtk_label_set_markup (GTK_LABEL (label), "Completion demo, try writing <b>total</b> or <b>gnome</b> for example.");

1
demos/gtk-demo/glarea.c
View File

@ -393,7 +393,6 @@ create_glarea_window (GtkWidget *do_widget)
gtk_window_set_screen (GTK_WINDOW (window), gtk_widget_get_screen (do_widget));
gtk_window_set_title (GTK_WINDOW (window), "OpenGL Area");
gtk_window_set_default_size (GTK_WINDOW (window), 400, 600);
gtk_container_set_border_width (GTK_CONTAINER (window), 12);
g_signal_connect (window, "destroy", G_CALLBACK (close_window), NULL);
box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE);

2
demos/gtk-demo/hypertext.c
View File

@ -268,8 +268,6 @@ do_hypertext (GtkWidget *do_widget)
g_signal_connect (window, "destroy",
G_CALLBACK (gtk_widget_destroyed), &window);
gtk_container_set_border_width (GTK_CONTAINER (window), 0);
view = gtk_text_view_new ();
gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view), GTK_WRAP_WORD);
gtk_text_view_set_left_margin (GTK_TEXT_VIEW (view), 20);

3
demos/gtk-demo/images.c
View File

@ -347,10 +347,7 @@ do_images (GtkWidget *do_widget)
g_signal_connect (window, "destroy",
G_CALLBACK (cleanup_callback), NULL);
gtk_container_set_border_width (GTK_CONTAINER (window), 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);
label = gtk_label_new (NULL);

2
demos/gtk-demo/infobar.c
View File

@ -59,7 +59,6 @@ do_infobar (GtkWidget *do_widget)
gtk_window_set_title (GTK_WINDOW (window), "Info Bars");
g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
gtk_container_set_border_width (GTK_CONTAINER (window), 8);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add (GTK_CONTAINER (window), vbox);
@ -132,7 +131,6 @@ do_infobar (GtkWidget *do_widget)
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
gtk_container_add (GTK_CONTAINER (frame), vbox2);
/* Standard message dialog */

1
demos/gtk-demo/links.c
View File

@ -56,7 +56,6 @@ do_links (GtkWidget *do_widget)
gtk_window_set_screen (GTK_WINDOW (window),
gtk_widget_get_screen (do_widget));
gtk_window_set_title (GTK_WINDOW (window), "Links");
gtk_container_set_border_width (GTK_CONTAINER (window), 12);
g_signal_connect (window, "destroy",
G_CALLBACK (gtk_widget_destroyed), &window);

1
demos/gtk-demo/list_store.c
View File

@ -262,7 +262,6 @@ do_list_store (GtkWidget *do_widget)
g_signal_connect (window, "destroy",
G_CALLBACK (gtk_widget_destroyed), &window);
gtk_container_set_border_width (GTK_CONTAINER (window), 8);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
gtk_container_add (GTK_CONTAINER (window), vbox);

3
demos/gtk-demo/menus.c
View File

@ -105,8 +105,6 @@ do_menus (GtkWidget *do_widget)
accel_group = gtk_accel_group_new ();
gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
gtk_container_set_border_width (GTK_CONTAINER (window), 0);
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_container_add (GTK_CONTAINER (window), box);
gtk_widget_show (box);
@ -138,7 +136,6 @@ do_menus (GtkWidget *do_widget)
gtk_widget_show (menuitem);
box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE);
gtk_widget_show (box2);

33
demos/gtk-demo/offscreen_window.c
View File

@ -233,18 +233,16 @@ gtk_rotated_bin_realize (GtkWidget *widget)
GdkWindow *window;
GdkWindowAttr attributes;
gint attributes_mask;
guint border_width;
GtkRequisition child_requisition;
gtk_widget_set_realized (widget, TRUE);
gtk_widget_get_allocation (widget, &allocation);
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
attributes.x = allocation.x + border_width;
attributes.y = allocation.y + border_width;
attributes.width = allocation.width - 2 * border_width;
attributes.height = allocation.height - 2 * border_width;
attributes.x = allocation.x;
attributes.y = allocation.y;
attributes.width = allocation.width;
attributes.height = allocation.height;
attributes.window_type = GDK_WINDOW_CHILD;
attributes.event_mask = gtk_widget_get_events (widget)
| GDK_EXPOSURE_MASK
@ -383,8 +381,6 @@ gtk_rotated_bin_size_request (GtkWidget *widget,
GtkRotatedBin *bin = GTK_ROTATED_BIN (widget);
GtkRequisition child_requisition;
double s, c;
double w, h;
guint border_width;
child_requisition.width = 0;
child_requisition.height = 0;
@ -395,12 +391,8 @@ gtk_rotated_bin_size_request (GtkWidget *widget,
s = sin (bin->angle);
c = cos (bin->angle);
w = c * child_requisition.width + s * child_requisition.height;
h = s * child_requisition.width + c * child_requisition.height;
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
requisition->width = border_width * 2 + w;
requisition->height = border_width * 2 + h;
requisition->width = c * child_requisition.width + s * child_requisition.height;
requisition->height = s * child_requisition.width + c * child_requisition.height;
}
static void
@ -432,21 +424,18 @@ gtk_rotated_bin_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
GtkRotatedBin *bin = GTK_ROTATED_BIN (widget);
guint border_width;
gint w, h;
gdouble s, c;
gtk_widget_set_allocation (widget, allocation);
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
w = allocation->width - border_width * 2;
h = allocation->height - border_width * 2;
w = allocation->width;
h = allocation->height;
if (gtk_widget_get_realized (widget))
gdk_window_move_resize (gtk_widget_get_window (widget),
allocation->x + border_width,
allocation->y + border_width,
allocation->x,
allocation->y,
w, h);
if (bin->child && gtk_widget_get_visible (bin->child))
@ -577,8 +566,6 @@ do_offscreen_window (GtkWidget *do_widget)
g_signal_connect (window, "destroy",
G_CALLBACK (gtk_widget_destroyed), &window);
gtk_container_set_border_width (GTK_CONTAINER (window), 10);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL,
0, G_PI/2, 0.01);

33
demos/gtk-demo/offscreen_window2.c
View File

@ -172,18 +172,16 @@ gtk_mirror_bin_realize (GtkWidget *widget)
GdkWindow *window;
GdkWindowAttr attributes;
gint attributes_mask;
guint border_width;
GtkRequisition child_requisition;
gtk_widget_set_realized (widget, TRUE);
gtk_widget_get_allocation (widget, &allocation);
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
attributes.x = allocation.x + border_width;
attributes.y = allocation.y + border_width;
attributes.width = allocation.width - 2 * border_width;
attributes.height = allocation.height - 2 * border_width;
attributes.x = allocation.x;
attributes.y = allocation.y;
attributes.width = allocation.width;
attributes.height = allocation.height;
attributes.window_type = GDK_WINDOW_CHILD;
attributes.event_mask = gtk_widget_get_events (widget)
| GDK_EXPOSURE_MASK
@ -309,7 +307,6 @@ gtk_mirror_bin_size_request (GtkWidget *widget,
{
GtkMirrorBin *bin = GTK_MIRROR_BIN (widget);
GtkRequisition child_requisition;
guint border_width;
child_requisition.width = 0;
child_requisition.height = 0;
@ -318,9 +315,8 @@ gtk_mirror_bin_size_request (GtkWidget *widget,
gtk_widget_get_preferred_size ( (bin->child),
&child_requisition, NULL);
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
requisition->width = border_width * 2 + child_requisition.width + 10;
requisition->height = border_width * 2 + child_requisition.height * 2 + 10;
requisition->width = child_requisition.width + 10;
requisition->height = child_requisition.height * 2 + 10;
}
static void
@ -353,19 +349,16 @@ gtk_mirror_bin_size_allocate (GtkWidget *widget,
{
GtkMirrorBin *bin = GTK_MIRROR_BIN (widget);
gint w, h;
guint border_width;
gtk_widget_set_allocation (widget, allocation);
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
w = allocation->width - border_width * 2;
h = allocation->height - border_width * 2;
w = allocation->width;
h = allocation->height;
if (gtk_widget_get_realized (widget))
gdk_window_move_resize (gtk_widget_get_window (widget),
allocation->x + border_width,
allocation->y + border_width,
allocation->x,
allocation->y,
w, h);
if (bin->child && gtk_widget_get_visible (bin->child))
@ -382,8 +375,8 @@ gtk_mirror_bin_size_allocate (GtkWidget *widget,
if (gtk_widget_get_realized (widget))
gdk_window_move_resize (bin->offscreen_window,
allocation->x + border_width,
allocation->y + border_width,
allocation->x,
allocation->y,
child_allocation.width, child_allocation.height);
gtk_widget_size_allocate (bin->child, &child_allocation);
}
@ -482,8 +475,6 @@ do_offscreen_window2 (GtkWidget *do_widget)
g_signal_connect (window, "destroy",
G_CALLBACK (gtk_widget_destroyed), &window);
gtk_container_set_border_width (GTK_CONTAINER (window), 10);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
bin = gtk_mirror_bin_new ();

3
demos/gtk-demo/panes.c
View File

@ -85,7 +85,6 @@ create_pane_options (GtkPaned *paned,
child2 = gtk_paned_get_child2 (paned);
frame = gtk_frame_new (frame_label);
gtk_container_set_border_width (GTK_CONTAINER (frame), 4);
table = gtk_grid_new ();
gtk_container_add (GTK_CONTAINER (frame), table);
@ -142,14 +141,12 @@ do_panes (GtkWidget *do_widget)
G_CALLBACK (gtk_widget_destroyed), &window);
gtk_window_set_title (GTK_WINDOW (window), "Paned Widgets");
gtk_container_set_border_width (GTK_CONTAINER (window), 0);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add (GTK_CONTAINER (window), vbox);
vpaned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
gtk_box_pack_start (GTK_BOX (vbox), vpaned, TRUE, TRUE);
gtk_container_set_border_width (GTK_CONTAINER(vpaned), 5);
hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
gtk_paned_add1 (GTK_PANED (vpaned), hpaned);

4
demos/gtk-demo/pickers.c
View File

@ -22,15 +22,11 @@ do_pickers (GtkWidget *do_widget)
g_signal_connect (window, "destroy",
G_CALLBACK (gtk_widget_destroyed), &window);
gtk_container_set_border_width (GTK_CONTAINER (window), 10);
table = gtk_grid_new ();
gtk_grid_set_row_spacing (GTK_GRID (table), 3);
gtk_grid_set_column_spacing (GTK_GRID (table), 10);
gtk_container_add (GTK_CONTAINER (window), table);
gtk_container_set_border_width (GTK_CONTAINER (table), 10);
label = gtk_label_new ("Color:");
gtk_widget_set_halign (label, GTK_ALIGN_START);
gtk_widget_set_valign (label, GTK_ALIGN_CENTER);

2
demos/gtk-demo/popover.c
View File

@ -25,7 +25,6 @@ create_popover (GtkWidget *parent,
popover = gtk_popover_new (parent);
gtk_popover_set_position (GTK_POPOVER (popover), pos);
gtk_container_add (GTK_CONTAINER (popover), child);
gtk_container_set_border_width (GTK_CONTAINER (popover), 6);
gtk_widget_show (child);
return popover;
@ -132,7 +131,6 @@ do_popover (GtkWidget *do_widget)
{
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 24);
gtk_container_set_border_width (GTK_CONTAINER (box), 24);
gtk_container_add (GTK_CONTAINER (window), box);
g_signal_connect (window, "destroy",

1
demos/gtk-demo/revealer.ui
View File

@ -2,7 +2,6 @@
<interface>
<!-- interface-requires gtk+ 3.6 -->
<object class="GtkWindow" id="window">
<property name="border_width">5</property>
<property name="default_width">300</property>
<property name="default_height">300</property>
<property name="title">Revealer</property>

1
demos/gtk-demo/scale.ui
View File

@ -21,7 +21,6 @@
</object>
<object class="GtkWindow" id="window1">
<property name="title" translatable="yes">Scales</property>
<property name="border-width" translatable="yes">20</property>
<child>
<object class="GtkGrid" id="grid1">
<property name="visible">1</property>

2
demos/gtk-demo/search_entry.c
View File

@ -239,7 +239,6 @@ do_search_entry (GtkWidget *do_widget)
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
gtk_container_add (GTK_CONTAINER (window), vbox);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
label = gtk_label_new (NULL);
gtk_label_set_markup (GTK_LABEL (label), "Search entry demo");
@ -247,7 +246,6 @@ do_search_entry (GtkWidget *do_widget)
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 0);
/* Create our entry */
entry = gtk_search_entry_new ();

3
demos/gtk-demo/search_entry2.c
View File

@ -87,7 +87,6 @@ do_search_entry2 (GtkWidget *do_widget)
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add (GTK_CONTAINER (window), vbox);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 0);
entry = gtk_search_entry_new ();
container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
@ -117,7 +116,6 @@ do_search_entry2 (GtkWidget *do_widget)
/* Result */
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 0);
label = gtk_label_new ("Result:");
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
@ -134,7 +132,6 @@ do_search_entry2 (GtkWidget *do_widget)
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 0);
label = gtk_label_new ("Signal:");
gtk_label_set_xalign (GTK_LABEL (label), 0.0);

3
demos/gtk-demo/sizegroup.c
View File

@ -109,7 +109,6 @@ do_sizegroup (GtkWidget *do_widget)
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
gtk_container_add (GTK_CONTAINER (window), vbox);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
g_object_set_data_full (G_OBJECT (window), "size-group", size_group, g_object_unref);
@ -119,7 +118,6 @@ do_sizegroup (GtkWidget *do_widget)
gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE);
table = gtk_grid_new ();
gtk_container_set_border_width (GTK_CONTAINER (table), 5);
gtk_grid_set_row_spacing (GTK_GRID (table), 5);
gtk_grid_set_column_spacing (GTK_GRID (table), 10);
gtk_container_add (GTK_CONTAINER (frame), table);
@ -132,7 +130,6 @@ do_sizegroup (GtkWidget *do_widget)
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
table = gtk_grid_new ();
gtk_container_set_border_width (GTK_CONTAINER (table), 5);
gtk_grid_set_row_spacing (GTK_GRID (table), 5);
gtk_grid_set_column_spacing (GTK_GRID (table), 10);
gtk_container_add (GTK_CONTAINER (frame), table);

1
demos/gtk-demo/spinner.c
View File

@ -53,7 +53,6 @@ do_spinner (GtkWidget *do_widget)
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
/* Sensitive */
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);

2
demos/gtk-demo/textview.c
View File

@ -481,10 +481,8 @@ do_textview (GtkWidget *do_widget)
G_CALLBACK (gtk_widget_destroyed), &window);
gtk_window_set_title (GTK_WINDOW (window), "Multiple Views");
gtk_container_set_border_width (GTK_CONTAINER (window), 0);
vpaned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
gtk_container_set_border_width (GTK_CONTAINER(vpaned), 5);
gtk_container_add (GTK_CONTAINER (window), vpaned);
/* For convenience, we just use the autocreated buffer from

1
demos/gtk-demo/theming_style_classes.c
View File

@ -25,7 +25,6 @@ do_theming_style_classes (GtkWidget *do_widget)
gtk_widget_get_screen (do_widget));
gtk_window_set_title (GTK_WINDOW (window), "Style Classes");
gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
gtk_container_set_border_width (GTK_CONTAINER (window), 12);
g_signal_connect (window, "destroy",
G_CALLBACK (gtk_widget_destroyed), &window);

5
demos/gtk-demo/toolpalette.c
View File

@ -443,7 +443,6 @@ do_toolpalette (GtkWidget *do_widget)
g_signal_connect (window, "destroy",
G_CALLBACK (gtk_widget_destroyed), &window);
gtk_container_set_border_width (GTK_CONTAINER (window), 8);
/* Add widgets to control the ToolPalette appearance: */
box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
@ -529,7 +528,6 @@ do_toolpalette (GtkWidget *do_widget)
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (palette_scroller),
GTK_POLICY_NEVER,
GTK_POLICY_AUTOMATIC);
gtk_container_set_border_width (GTK_CONTAINER (palette_scroller), 6);
gtk_widget_set_hexpand (palette_scroller, TRUE);
gtk_container_add (GTK_CONTAINER (palette_scroller), palette);
@ -549,7 +547,6 @@ do_toolpalette (GtkWidget *do_widget)
/* ===== notebook ===== */
notebook = gtk_notebook_new ();
gtk_container_set_border_width (GTK_CONTAINER (notebook), 6);
gtk_box_pack_end (GTK_BOX(hbox), notebook, FALSE, FALSE);
/* ===== DnD for tool items ===== */
@ -585,7 +582,6 @@ do_toolpalette (GtkWidget *do_widget)
GTK_POLICY_AUTOMATIC,
GTK_POLICY_ALWAYS);
gtk_container_add (GTK_CONTAINER (contents_scroller), contents);
gtk_container_set_border_width (GTK_CONTAINER (contents_scroller), 6);
gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
contents_scroller,
@ -615,7 +611,6 @@ do_toolpalette (GtkWidget *do_widget)
GTK_POLICY_AUTOMATIC,
GTK_POLICY_ALWAYS);
gtk_container_add (GTK_CONTAINER (contents_scroller), contents);
gtk_container_set_border_width (GTK_CONTAINER (contents_scroller), 6);
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), contents_scroller,
gtk_label_new ("Interactive DnD Mode"));

1
demos/gtk-demo/transparent.c
View File

@ -202,7 +202,6 @@ do_transparent (GtkWidget *do_widget)
G_CALLBACK (gtk_widget_destroyed), &window);
gtk_window_set_title (GTK_WINDOW (window), "Transparency");
gtk_container_set_border_width (GTK_CONTAINER (window), 0);
view = gtk_text_view_new ();

1
demos/gtk-demo/tree_store.c
View File

@ -398,7 +398,6 @@ do_tree_store (GtkWidget *do_widget)
G_CALLBACK (gtk_widget_destroyed), &window);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
gtk_container_add (GTK_CONTAINER (window), vbox);
gtk_box_pack_start (GTK_BOX (vbox),

3
demos/widget-factory/widget-factory.ui
View File

@ -441,7 +441,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
<object class="GtkBox" id="page1">
<property name="visible">1</property>
<property name="orientation">vertical</property>
<property name="border-width">10</property>
<property name="spacing">10</property>
<child>
<object class="GtkBox" id="box2">
@ -1830,7 +1829,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
<object class="GtkBox">
<property name="visible">1</property>
<property name="spacing">10</property>
<property name="border-width">16</property>
<child>
<object class="GtkBox">
<property name="visible">1</property>
@ -2873,7 +2871,6 @@ microphone-sensitivity-medium-symbolic</property>
<child>
<object class="GtkBox">
<property name="visible">1</property>
<property name="border-width">16</property>
<property name="spacing">10</property>
<child>
<object class="GtkBox">

3
docs/reference/gtk/gtk4-sections.txt
View File

@ -999,8 +999,6 @@ gtk_container_child_set_valist
gtk_container_child_notify
gtk_container_child_notify_by_pspec
gtk_container_forall
gtk_container_get_border_width
gtk_container_set_border_width
gtk_container_propagate_draw
gtk_container_get_focus_chain
gtk_container_set_focus_chain
@ -1009,7 +1007,6 @@ gtk_container_class_find_child_property
gtk_container_class_install_child_property
gtk_container_class_install_child_properties
gtk_container_class_list_child_properties
gtk_container_class_handle_border_width
<SUBSECTION Standard>
GTK_CONTAINER

6
docs/tools/widgets.c
View File

@ -36,7 +36,6 @@ new_widget_info (const char *name,
else
{
info->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_container_set_border_width (GTK_CONTAINER (info->window), 12);
info->include_decorations = FALSE;
gtk_widget_show_all (widget);
gtk_container_add (GTK_CONTAINER (info->window), widget);
@ -391,7 +390,6 @@ create_info_bar (void)
gtk_container_add (GTK_CONTAINER (align), widget);
info = new_widget_info ("info-bar", align, SMALL);
gtk_container_set_border_width (GTK_CONTAINER (info->window), 0);
return info;
}
@ -423,7 +421,6 @@ create_search_bar (void)
gtk_box_pack_start (GTK_BOX (box), view, TRUE, TRUE);
info = new_widget_info ("search-bar", box, SMALL);
gtk_container_set_border_width (GTK_CONTAINER (info->window), 0);
return info;
}
@ -457,7 +454,6 @@ create_action_bar (void)
gtk_container_add (GTK_CONTAINER (box), widget);
info = new_widget_info ("action-bar", box, SMALL);
gtk_container_set_border_width (GTK_CONTAINER (info->window), 0);
return info;
}
@ -1086,7 +1082,6 @@ create_statusbar (void)
gtk_box_pack_end (GTK_BOX (vbox), align, FALSE, FALSE);
info = new_widget_info ("statusbar", vbox, SMALL);
gtk_container_set_border_width (GTK_CONTAINER (info->window), 0);
return info;
}
@ -1280,7 +1275,6 @@ create_headerbar (void)
GtkWidget *button;
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_container_set_border_width (GTK_CONTAINER (window), 0);
view = gtk_text_view_new ();
gtk_widget_show (view);
gtk_widget_set_size_request (window, 220, 150);

1
examples/action-namespace.c
View File

@ -114,7 +114,6 @@ activate (GApplication *app,
gtk_widget_set_halign (GTK_WIDGET (button), GTK_ALIGN_CENTER);
gtk_widget_set_valign (GTK_WIDGET (button), GTK_ALIGN_START);
gtk_container_add (GTK_CONTAINER (win), button);
gtk_container_set_border_width (GTK_CONTAINER (win), 12);
gtk_widget_show_all (win);
g_object_unref (button_menu);

1
examples/builder.ui
View File

@ -2,7 +2,6 @@
<object id="window" class="GtkWindow">
<property name="visible">True</property>
<property name="title">Grid</property>
<property name="border-width">10</property>
<child>
<object id="grid" class="GtkGrid">
<property name="visible">True</property>

2
examples/drawing.c
View File

@ -142,8 +142,6 @@ activate (GtkApplication *app,
g_signal_connect (window, "destroy", G_CALLBACK (close_window), NULL);
gtk_container_set_border_width (GTK_CONTAINER (window), 8);
frame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
gtk_container_add (GTK_CONTAINER (window), frame);

1
examples/grid-packing.c
View File

@ -18,7 +18,6 @@ activate (GtkApplication *app,
/* create a new window, and set its title */
window = gtk_application_window_new (app);
gtk_window_set_title (GTK_WINDOW (window), "Window");
gtk_container_set_border_width (GTK_CONTAINER (window), 10);
/* Here we construct the container that is going pack our buttons */
grid = gtk_grid_new ();

1
examples/plugman.c
View File

@ -338,7 +338,6 @@ configure_plugins (GSimpleAction *action,
gtk_builder_add_from_string (builder,
"<interface>"
" <object class='GtkDialog' id='plugin-dialog'>"
" <property name='border-width'>12</property>"
" <property name='title'>Plugins</property>"
" <child internal-child='vbox'>"
" <object class='GtkBox' id='content-area'>"

21
gtk/deprecated/gtkalignment.c
View File

@ -556,7 +556,6 @@ gtk_alignment_size_allocate (GtkWidget *widget,
GtkAllocation child_allocation;
GtkWidget *child;
gint width, height;
gint border_width;
gint baseline;
gtk_widget_set_allocation (widget, allocation);
@ -571,17 +570,15 @@ gtk_alignment_size_allocate (GtkWidget *widget,
gint child_width, child_height;
double yalign, yscale;
border_width = gtk_container_get_border_width (GTK_CONTAINER (alignment));
padding_horizontal = priv->padding_left + priv->padding_right;
padding_vertical = priv->padding_top + priv->padding_bottom;
width = MAX (1, allocation->width - padding_horizontal - 2 * border_width);
height = MAX (1, allocation->height - padding_vertical - 2 * border_width);
width = MAX (1, allocation->width - padding_horizontal);
height = MAX (1, allocation->height - padding_vertical);
baseline = gtk_widget_get_allocated_baseline (widget);
if (baseline != -1)
baseline -= border_width + priv->padding_top;
baseline -= priv->padding_top;
/* If we get a baseline set that means we're baseline aligned, and the parent
honored that. In that case we have to ignore yalign/yscale as we need
@ -634,11 +631,11 @@ gtk_alignment_size_allocate (GtkWidget *widget,
child_allocation.height = height;
if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
child_allocation.x = (1.0 - priv->xalign) * (width - child_allocation.width) + allocation->x + border_width + priv->padding_right;
child_allocation.x = (1.0 - priv->xalign) * (width - child_allocation.width) + allocation->x + priv->padding_right;
else
child_allocation.x = priv->xalign * (width - child_allocation.width) + allocation->x + border_width + priv->padding_left;
child_allocation.x = priv->xalign * (width - child_allocation.width) + allocation->x + priv->padding_left;
child_allocation.y = yalign * (height - child_allocation.height) + allocation->y + border_width + priv->padding_top;
child_allocation.y = yalign * (height - child_allocation.height) + allocation->y + priv->padding_top;
gtk_widget_size_allocate_with_baseline (child, &child_allocation, baseline);
}
@ -659,16 +656,14 @@ gtk_alignment_get_preferred_size (GtkWidget *widget,
GtkWidget *child;
guint minimum, natural;
guint top_offset;
guint border;
if (minimum_baseline)
*minimum_baseline = -1;
if (natural_baseline)
*natural_baseline = -1;
border = gtk_container_get_border_width (GTK_CONTAINER (widget));
natural = minimum = border * 2;
top_offset = border;
natural = minimum = 0;
top_offset = 0;
if ((child = gtk_bin_get_child (GTK_BIN (widget))) && gtk_widget_get_visible (child))
{

1
gtk/deprecated/gtktable.c
View File

@ -177,7 +177,6 @@ gtk_table_class_init (GtkTableClass *class)
container_class->child_type = gtk_table_child_type;
container_class->set_child_property = gtk_table_set_child_property;
container_class->get_child_property = gtk_table_get_child_property;
gtk_container_class_handle_border_width (container_class);
g_object_class_install_property (gobject_class,
PROP_N_ROWS,

2
gtk/gtk-builder-tool.c
View File

@ -186,14 +186,12 @@ needs_explicit_setting (MyParserData *data,
{ "GtkCalendar", "year", 0 },
{ "GtkCalendar", "month", 0 },
{ "GtkCalendar", "day", 0 },
{ "GtkDialog", "border-width", 0 },
{ "GtkPlacesSidebar", "show-desktop", 0 },
{ "GtkRadioButton", "draw-indicator", 0 },
{ "GtkGrid", "left-attach", 1 },
{ "GtkGrid", "top-attach", 1 },
{ "GtkWidget", "hexpand", 0 },
{ "GtkWidget", "vexpand", 0 },
{ "GtkContainer", "border-width", 0 },
{ "GtkVBox", "expand", 1 },
{ NULL, NULL, 0 }
};

48
gtk/gtkappchooserdialog.c
View File

@ -522,45 +522,6 @@ gtk_app_chooser_dialog_constructed (GObject *object)
setup_search (self);
}
/* This is necessary do deal with the fact that GtkDialog
* exposes bits of its internal spacing as style properties,
* and puts the action area inside the content area.
* To achieve a flush-top search bar, we need the content
* area border to be 0, and distribute the spacing to other
* containers to compensate.
*/
static void
update_spacings (GtkAppChooserDialog *self)
{
GtkWidget *widget;
gint content_area_border;
gint action_area_border;
gtk_widget_style_get (GTK_WIDGET (self),
"content-area-border", &content_area_border,
"action-area-border", &action_area_border,
NULL);
widget = gtk_dialog_get_content_area (GTK_DIALOG (self));
gtk_container_set_border_width (GTK_CONTAINER (widget), 0);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
widget = gtk_dialog_get_action_area (GTK_DIALOG (self));
G_GNUC_END_IGNORE_DEPRECATIONS
gtk_container_set_border_width (GTK_CONTAINER (widget), 5 + content_area_border + action_area_border);
widget = self->priv->inner_box;
gtk_container_set_border_width (GTK_CONTAINER (widget), 10 + content_area_border);
}
static void
gtk_app_chooser_dialog_style_updated (GtkWidget *widget)
{
GTK_WIDGET_CLASS (gtk_app_chooser_dialog_parent_class)->style_updated (widget);
update_spacings (GTK_APP_CHOOSER_DIALOG (widget));
}
static void
gtk_app_chooser_dialog_dispose (GObject *object)
{
@ -646,20 +607,19 @@ gtk_app_chooser_dialog_iface_init (GtkAppChooserIface *iface)
static void
gtk_app_chooser_dialog_class_init (GtkAppChooserDialogClass *klass)
{
GtkWidgetClass *widget_class;
GObjectClass *gobject_class;
GtkWidgetClass *widget_class;
GParamSpec *pspec;
gobject_class = G_OBJECT_CLASS (klass);
widget_class = GTK_WIDGET_CLASS (klass);
gobject_class->dispose = gtk_app_chooser_dialog_dispose;
gobject_class->finalize = gtk_app_chooser_dialog_finalize;
gobject_class->set_property = gtk_app_chooser_dialog_set_property;
gobject_class->get_property = gtk_app_chooser_dialog_get_property;
gobject_class->constructed = gtk_app_chooser_dialog_constructed;
widget_class = GTK_WIDGET_CLASS (klass);
widget_class->style_updated = gtk_app_chooser_dialog_style_updated;
g_object_class_override_property (gobject_class, PROP_CONTENT_TYPE, "content-type");
/**
@ -718,8 +678,6 @@ gtk_app_chooser_dialog_init (GtkAppChooserDialog *self)
*/
g_signal_connect (self, "response",
G_CALLBACK (gtk_app_chooser_dialog_response), NULL);
update_spacings (self);
}
static void

12
gtk/gtkapplicationwindow.c
View File

@ -579,16 +579,14 @@ gtk_application_window_real_get_preferred_width (GtkWidget *widget,
if (window->priv->menubar != NULL)
{
gint menubar_min_width, menubar_nat_width;
gint border_width;
GtkBorder border = { 0 };
gtk_widget_get_preferred_width (window->priv->menubar, &menubar_min_width, &menubar_nat_width);
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
_gtk_window_get_shadow_width (GTK_WINDOW (widget), &border);
menubar_min_width += 2 * border_width + border.left + border.right;
menubar_nat_width += 2 * border_width + border.left + border.right;
menubar_min_width += border.left + border.right;
menubar_nat_width += border.left + border.right;
*minimum_width = MAX (*minimum_width, menubar_min_width);
*natural_width = MAX (*natural_width, menubar_nat_width);
@ -615,16 +613,14 @@ gtk_application_window_real_get_preferred_width_for_height (GtkWidget *widget,
if (window->priv->menubar != NULL)
{
gint menubar_min_width, menubar_nat_width;
gint border_width;
GtkBorder border = { 0 };
gtk_widget_get_preferred_width_for_height (window->priv->menubar, menubar_height, &menubar_min_width, &menubar_nat_width);
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
_gtk_window_get_shadow_width (GTK_WINDOW (widget), &border);
menubar_min_width += 2 * border_width + border.left + border.right;
menubar_nat_width += 2 * border_width + border.left + border.right;
menubar_min_width += border.left + border.right;
menubar_nat_width += border.left + border.right;
*minimum_width = MAX (*minimum_width, menubar_min_width);
*natural_width = MAX (*natural_width, menubar_nat_width);

1
gtk/gtkbbox.c
View File

@ -203,7 +203,6 @@ gtk_button_box_class_init (GtkButtonBoxClass *class)
container_class->add = gtk_button_box_add;
container_class->set_child_property = gtk_button_box_set_child_property;
container_class->get_child_property = gtk_button_box_get_child_property;
gtk_container_class_handle_border_width (container_class);
/**
* GtkButtonBox:child-min-width:

45
gtk/gtkbin.c
View File

@ -171,15 +171,6 @@ gtk_bin_forall (GtkContainer *container,
(* callback) (priv->child, callback_data);
}
static int
gtk_bin_get_effective_border_width (GtkBin *bin)
{
if (GTK_CONTAINER_CLASS (GTK_BIN_GET_CLASS (bin))->_handle_border_width)
return 0;
return gtk_container_get_border_width (GTK_CONTAINER (bin));
}
static void
gtk_bin_get_preferred_width (GtkWidget *widget,
gint *minimum_width,
@ -187,7 +178,6 @@ gtk_bin_get_preferred_width (GtkWidget *widget,
{
GtkBin *bin = GTK_BIN (widget);
GtkBinPrivate *priv = bin->priv;
gint border_width;
*minimum_width = 0;
*natural_width = 0;
@ -200,10 +190,6 @@ gtk_bin_get_preferred_width (GtkWidget *widget,
*minimum_width = child_min;
*natural_width = child_nat;
}
border_width = gtk_bin_get_effective_border_width (bin);
*minimum_width += 2 * border_width;
*natural_width += 2 * border_width;
}
static void
@ -213,7 +199,6 @@ gtk_bin_get_preferred_height (GtkWidget *widget,
{
GtkBin *bin = GTK_BIN (widget);
GtkBinPrivate *priv = bin->priv;
gint border_width;
*minimum_height = 0;
*natural_height = 0;
@ -226,10 +211,6 @@ gtk_bin_get_preferred_height (GtkWidget *widget,
*minimum_height = child_min;
*natural_height = child_nat;
}
border_width = gtk_bin_get_effective_border_width (bin);
*minimum_height += 2 * border_width;
*natural_height += 2 * border_width;
}
static void
@ -240,25 +221,19 @@ gtk_bin_get_preferred_width_for_height (GtkWidget *widget,
{
GtkBin *bin = GTK_BIN (widget);
GtkBinPrivate *priv = bin->priv;
gint border_width;
*minimum_width = 0;
*natural_width = 0;
border_width = gtk_bin_get_effective_border_width (bin);
if (priv->child && gtk_widget_get_visible (priv->child))
{
gint child_min, child_nat;
gtk_widget_get_preferred_width_for_height (priv->child, height - 2 * border_width,
gtk_widget_get_preferred_width_for_height (priv->child, height,
&child_min, &child_nat);
*minimum_width = child_min;
*natural_width = child_nat;
}
*minimum_width += 2 * border_width;
*natural_width += 2 * border_width;
}
static void
@ -269,25 +244,19 @@ gtk_bin_get_preferred_height_for_width (GtkWidget *widget,
{
GtkBin *bin = GTK_BIN (widget);
GtkBinPrivate *priv = bin->priv;
gint border_width;
*minimum_height = 0;
*natural_height = 0;
border_width = gtk_bin_get_effective_border_width (bin);
if (priv->child && gtk_widget_get_visible (priv->child))
{
gint child_min, child_nat;
gtk_widget_get_preferred_height_for_width (priv->child, width - 2 * border_width,
gtk_widget_get_preferred_height_for_width (priv->child, width,
&child_min, &child_nat);
*minimum_height = child_min;
*natural_height = child_nat;
}
*minimum_height += 2 * border_width;
*natural_height += 2 * border_width;
}
static void
@ -301,15 +270,7 @@ gtk_bin_size_allocate (GtkWidget *widget,
if (priv->child && gtk_widget_get_visible (priv->child))
{
GtkAllocation child_allocation;
gint border_width = gtk_bin_get_effective_border_width (bin);
child_allocation.x = allocation->x + border_width;
child_allocation.y = allocation->y + border_width;
child_allocation.width = allocation->width - 2 * border_width;
child_allocation.height = allocation->height - 2 * border_width;
gtk_widget_size_allocate (priv->child, &child_allocation);
gtk_widget_size_allocate (priv->child, allocation);
}
}

1
gtk/gtkbox.c
View File

@ -265,7 +265,6 @@ gtk_box_class_init (GtkBoxClass *class)
container_class->set_child_property = gtk_box_set_child_property;
container_class->get_child_property = gtk_box_get_child_property;
container_class->get_path_for_child = gtk_box_get_path_for_child;
gtk_container_class_handle_border_width (container_class);
g_object_class_override_property (object_class,
PROP_ORIENTATION,

2
gtk/gtkbuilder.c
View File

@ -174,10 +174,8 @@
* <object class="GtkDialog" id="dialog1">
* <child internal-child="vbox">
* <object class="GtkBox" id="vbox1">
* <property name="border-width">10</property>
* <child internal-child="action_area">
* <object class="GtkButtonBox" id="hbuttonbox1">
* <property name="border-width">20</property>
* <child>
* <object class="GtkButton" id="ok_button">
* <property name="label">gtk-ok</property>

4
gtk/gtkbutton.c
View File

@ -219,11 +219,9 @@ gtk_button_class_init (GtkButtonClass *klass)
{
GObjectClass *gobject_class;
GtkWidgetClass *widget_class;
GtkContainerClass *container_class;
gobject_class = G_OBJECT_CLASS (klass);
widget_class = (GtkWidgetClass*) klass;
container_class = (GtkContainerClass*) klass;
gobject_class->constructed = gtk_button_constructed;
gobject_class->dispose = gtk_button_dispose;
@ -250,8 +248,6 @@ gtk_button_class_init (GtkButtonClass *klass)
widget_class->state_changed = gtk_button_state_changed;
widget_class->grab_notify = gtk_button_grab_notify;
gtk_container_class_handle_border_width (container_class);
klass->clicked = NULL;
klass->activate = gtk_real_button_activate;

2
gtk/gtkcombobox.c
View File

@ -668,8 +668,6 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
container_class->add = gtk_combo_box_add;
container_class->remove = gtk_combo_box_remove;
gtk_container_class_handle_border_width (container_class);
widget_class = (GtkWidgetClass *)klass;
widget_class->size_allocate = gtk_combo_box_size_allocate;
widget_class->draw = gtk_combo_box_draw;

248
gtk/gtkcontainer.c
View File

@ -280,9 +280,6 @@ struct _GtkContainerPrivate
GdkFrameClock *resize_clock;
guint resize_handler;
guint border_width : 16;
guint border_width_set : 1;
guint has_focus_chain : 1;
guint reallocate_redraws : 1;
guint restyle_pending : 1;
@ -301,7 +298,6 @@ enum {
enum {
PROP_0,
PROP_BORDER_WIDTH,
PROP_RESIZE_MODE,
PROP_CHILD,
LAST_PROP
@ -350,21 +346,6 @@ static gint gtk_container_draw (GtkWidget *widget,
cairo_t *cr);
static void gtk_container_map (GtkWidget *widget);
static void gtk_container_unmap (GtkWidget *widget);
static void gtk_container_adjust_size_request (GtkWidget *widget,
GtkOrientation orientation,
gint *minimum_size,
gint *natural_size);
static void gtk_container_adjust_baseline_request (GtkWidget *widget,
gint *minimum_baseline,
gint *natural_baseline);
static void gtk_container_adjust_size_allocation (GtkWidget *widget,
GtkOrientation orientation,
gint *minimum_size,
gint *natural_size,
gint *allocated_pos,
gint *allocated_size);
static void gtk_container_adjust_baseline_allocation (GtkWidget *widget,
gint *baseline);
static GtkSizeRequestMode gtk_container_get_request_mode (GtkWidget *widget);
static gchar* gtk_container_child_default_composite_name (GtkContainer *container,
@ -510,11 +491,6 @@ gtk_container_class_init (GtkContainerClass *class)
widget_class->map = gtk_container_map;
widget_class->unmap = gtk_container_unmap;
widget_class->focus = gtk_container_focus;
widget_class->adjust_size_request = gtk_container_adjust_size_request;
widget_class->adjust_baseline_request = gtk_container_adjust_baseline_request;
widget_class->adjust_size_allocation = gtk_container_adjust_size_allocation;
widget_class->adjust_baseline_allocation = gtk_container_adjust_baseline_allocation;
widget_class->get_request_mode = gtk_container_get_request_mode;
class->add = gtk_container_add_unimplemented;
@ -534,14 +510,6 @@ gtk_container_class_init (GtkContainerClass *class)
GTK_RESIZE_PARENT,
GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY|G_PARAM_DEPRECATED);
container_props[PROP_BORDER_WIDTH] =
g_param_spec_uint ("border-width",
P_("Border width"),
P_("The width of the empty border outside the containers children"),
0, 65535,
0,
GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
container_props[PROP_CHILD] =
g_param_spec_object ("child",
P_("Child"),
@ -1674,10 +1642,8 @@ gtk_container_init (GtkContainer *container)
priv = container->priv;
priv->focus_child = NULL;
priv->border_width = 0;
priv->resize_mode = GTK_RESIZE_PARENT;
priv->reallocate_redraws = FALSE;
priv->border_width_set = FALSE;
}
static void
@ -1712,9 +1678,6 @@ gtk_container_set_property (GObject *object,
switch (prop_id)
{
case PROP_BORDER_WIDTH:
gtk_container_set_border_width (container, g_value_get_uint (value));
break;
case PROP_RESIZE_MODE:
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
gtk_container_set_resize_mode (container, g_value_get_enum (value));
@ -1740,9 +1703,6 @@ gtk_container_get_property (GObject *object,
switch (prop_id)
{
case PROP_BORDER_WIDTH:
g_value_set_uint (value, priv->border_width);
break;
case PROP_RESIZE_MODE:
g_value_set_enum (value, priv->resize_mode);
break;
@ -1752,86 +1712,6 @@ gtk_container_get_property (GObject *object,
}
}
gboolean
_gtk_container_get_border_width_set (GtkContainer *container)
{
GtkContainerPrivate *priv;
g_return_val_if_fail (GTK_IS_CONTAINER (container), FALSE);
priv = container->priv;
return priv->border_width_set;
}
void
_gtk_container_set_border_width_set (GtkContainer *container,
gboolean border_width_set)
{
GtkContainerPrivate *priv;
g_return_if_fail (GTK_IS_CONTAINER (container));
priv = container->priv;
priv->border_width_set = border_width_set ? TRUE : FALSE;
}
/**
* gtk_container_set_border_width:
* @container: a #GtkContainer
* @border_width: amount of blank space to leave outside
* the container. Valid values are in the range 0-65535 pixels.
*
* Sets the border width of the container.
*
* The border width of a container is the amount of space to leave
* around the outside of the container. The only exception to this is
* #GtkWindow; because toplevel windows can’t leave space outside,
* they leave the space inside. The border is added on all sides of
* the container. To add space to only one side, use a specific
* #GtkWidget:margin property on the child widget, for example
* #GtkWidget:margin-top.
**/
void
gtk_container_set_border_width (GtkContainer *container,
guint border_width)
{
GtkContainerPrivate *priv;
g_return_if_fail (GTK_IS_CONTAINER (container));
priv = container->priv;
if (priv->border_width != border_width)
{
priv->border_width = border_width;
_gtk_container_set_border_width_set (container, TRUE);
g_object_notify_by_pspec (G_OBJECT (container), container_props[PROP_BORDER_WIDTH]);
if (_gtk_widget_get_realized (GTK_WIDGET (container)))
gtk_widget_queue_resize (GTK_WIDGET (container));
}
}
/**
* gtk_container_get_border_width:
* @container: a #GtkContainer
*
* Retrieves the border width of the container. See
* gtk_container_set_border_width().
*
* Returns: the current border width
**/
guint
gtk_container_get_border_width (GtkContainer *container)
{
g_return_val_if_fail (GTK_IS_CONTAINER (container), 0);
return container->priv->border_width;
}
/**
* gtk_container_add:
* @container: a #GtkContainer
@ -2240,111 +2120,6 @@ gtk_container_resize_children (GtkContainer *container)
gtk_widget_size_allocate_with_baseline (widget, &allocation, baseline);
}
static void
gtk_container_adjust_size_request (GtkWidget *widget,
GtkOrientation orientation,
gint *minimum_size,
gint *natural_size)
{
GtkContainer *container;
container = GTK_CONTAINER (widget);
if (GTK_CONTAINER_GET_CLASS (widget)->_handle_border_width)
{
int border_width;
border_width = container->priv->border_width;
*minimum_size += border_width * 2;
*natural_size += border_width * 2;
}
/* chain up last so gtk_widget_set_size_request() values
* will have a chance to overwrite our border width.
*/
parent_class->adjust_size_request (widget, orientation,
minimum_size, natural_size);
}
static void
gtk_container_adjust_baseline_request (GtkWidget *widget,
gint *minimum_baseline,
gint *natural_baseline)
{
GtkContainer *container;
container = GTK_CONTAINER (widget);
if (GTK_CONTAINER_GET_CLASS (widget)->_handle_border_width)
{
int border_width;
border_width = container->priv->border_width;
*minimum_baseline += border_width;
*natural_baseline += border_width;
}
parent_class->adjust_baseline_request (widget, minimum_baseline, natural_baseline);
}
static void
gtk_container_adjust_size_allocation (GtkWidget *widget,
GtkOrientation orientation,
gint *minimum_size,
gint *natural_size,
gint *allocated_pos,
gint *allocated_size)
{
GtkContainer *container;
int border_width;
container = GTK_CONTAINER (widget);
if (GTK_CONTAINER_GET_CLASS (widget)->_handle_border_width)
{
border_width = container->priv->border_width;
*allocated_size -= border_width * 2;
*allocated_pos += border_width;
*minimum_size -= border_width * 2;
*natural_size -= border_width * 2;
}
/* Chain up to GtkWidgetClass *after* removing our border width from
* the proposed allocation size. This is because it's possible that the
* widget was allocated more space than it needs in a said orientation,
* if GtkWidgetClass does any alignments and thus limits the size to the
* natural size... then we need that to be done *after* removing any margins
* and padding values.
*/
parent_class->adjust_size_allocation (widget, orientation,
minimum_size, natural_size, allocated_pos,
allocated_size);
}
static void
gtk_container_adjust_baseline_allocation (GtkWidget *widget,
gint *baseline)
{
GtkContainer *container;
int border_width;
container = GTK_CONTAINER (widget);
if (GTK_CONTAINER_GET_CLASS (widget)->_handle_border_width)
{
border_width = container->priv->border_width;
if (*baseline >= 0)
*baseline -= border_width;
}
parent_class->adjust_baseline_allocation (widget, baseline);
}
typedef struct {
gint hfw;
gint wfh;
@ -2386,29 +2161,6 @@ gtk_container_get_request_mode (GtkWidget *widget)
GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH;
}
/**
* gtk_container_class_handle_border_width:
* @klass: the class struct of a #GtkContainer subclass
*
* Modifies a subclass of #GtkContainerClass to automatically add and
* remove the border-width setting on GtkContainer. This allows the
* subclass to ignore the border width in its size request and
* allocate methods. The intent is for a subclass to invoke this
* in its class_init function.
*
* gtk_container_class_handle_border_width() is necessary because it
* would break API too badly to make this behavior the default. So
* subclasses must “opt in” to the parent class handling border_width
* for them.
*/
void
gtk_container_class_handle_border_width (GtkContainerClass *klass)
{
g_return_if_fail (GTK_IS_CONTAINER_CLASS (klass));
klass->_handle_border_width = TRUE;
}
/**
* gtk_container_forall: (virtual forall)
* @container: a #GtkContainer

11
gtk/gtkcontainer.h
View File

@ -107,8 +107,6 @@ struct _GtkContainerClass
/*< private >*/
unsigned int _handle_border_width : 1;
/* Padding for future expansion */
void (*_gtk_reserved1) (void);
void (*_gtk_reserved2) (void);
@ -139,11 +137,7 @@ typedef enum
GDK_AVAILABLE_IN_ALL
GType gtk_container_get_type (void) G_GNUC_CONST;
GDK_AVAILABLE_IN_ALL
void gtk_container_set_border_width (GtkContainer *container,
guint border_width);
GDK_AVAILABLE_IN_ALL
guint gtk_container_get_border_width (GtkContainer *container);
GDK_AVAILABLE_IN_ALL
void gtk_container_add (GtkContainer *container,
GtkWidget *widget);
@ -292,9 +286,6 @@ void gtk_container_forall (GtkContainer *container,
GtkCallback callback,
gpointer callback_data);
GDK_AVAILABLE_IN_ALL
void gtk_container_class_handle_border_width (GtkContainerClass *klass);
GDK_AVAILABLE_IN_ALL
GtkWidgetPath * gtk_container_get_path_for_child (GtkContainer *container,
GtkWidget *child);

3
gtk/gtkcontainerprivate.h
View File

@ -39,9 +39,6 @@ gboolean _gtk_container_get_reallocate_redraws (GtkContainer *container);
void _gtk_container_stop_idle_sizer (GtkContainer *container);
void _gtk_container_maybe_start_idle_sizer (GtkContainer *container);
gboolean _gtk_container_get_border_width_set (GtkContainer *container);
void _gtk_container_set_border_width_set (GtkContainer *container,
gboolean border_width_set);
void gtk_container_get_children_clip (GtkContainer *container,
GtkAllocation *out_clip);
void gtk_container_set_default_resize_mode (GtkContainer *container,

9
gtk/gtkcustompaperunixdialog.c
View File

@ -1021,7 +1021,7 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog)
{
GtkCustomPaperUnixDialogPrivate *priv = dialog->priv;
GtkDialog *cpu_dialog = GTK_DIALOG (dialog);
GtkWidget *action_area, *content_area;
GtkWidget *content_area;
GtkWidget *grid, *label, *widget, *frame, *combo;
GtkWidget *hbox, *vbox, *treeview, *scrolled, *toolbar, *button;
GtkCellRenderer *cell;
@ -1033,16 +1033,9 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog)
GtkStyleContext *context;
content_area = gtk_dialog_get_content_area (cpu_dialog);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
action_area = gtk_dialog_get_action_area (cpu_dialog);
G_GNUC_END_IGNORE_DEPRECATIONS
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
gtk_box_set_spacing (GTK_BOX (content_area), 2); /* 2 * 5 + 2 = 12 */
gtk_container_set_border_width (GTK_CONTAINER (action_area), 5);
gtk_box_set_spacing (GTK_BOX (action_area), 6);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 18);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE);
gtk_widget_show (hbox);

51
gtk/gtkdialog.c
View File

@ -575,22 +575,6 @@ gtk_dialog_class_init (GtkDialogClass *class)
NULL,
G_TYPE_NONE, 0);
/**
* GtkDialog:content-area-border:
*
* The default border width used around the
* content area of the dialog, as returned by
* gtk_dialog_get_content_area(), unless gtk_container_set_border_width()
* was called on that widget directly.
*/
gtk_widget_class_install_style_property (widget_class,
g_param_spec_int ("content-area-border",
P_("Content area border"),
P_("Width of border around the main dialog area"),
0,
G_MAXINT,
2,
GTK_PARAM_READABLE));
/**
* GtkDialog:content-area-spacing:
*
@ -618,23 +602,6 @@ gtk_dialog_class_init (GtkDialogClass *class)
6,
GTK_PARAM_READABLE));
/**
* GtkDialog:action-area-border:
*
* The default border width used around the
* action area of the dialog, as returned by
* gtk_dialog_get_action_area(), unless gtk_container_set_border_width()
* was called on that widget directly.
*/
gtk_widget_class_install_style_property (widget_class,
g_param_spec_int ("action-area-border",
P_("Action area border"),
P_("Width of border around the button area at the bottom of the dialog"),
0,
G_MAXINT,
5,
GTK_PARAM_READABLE));
/**
* GtkDialog:use-header-bar:
*
@ -673,25 +640,14 @@ static void
update_spacings (GtkDialog *dialog)
{
GtkDialogPrivate *priv = dialog->priv;
gint content_area_border;
gint content_area_spacing;
gint button_spacing;
gint action_area_border;
gtk_widget_style_get (GTK_WIDGET (dialog),
"content-area-border", &content_area_border,
"content-area-spacing", &content_area_spacing,
"button-spacing", &button_spacing,
"action-area-border", &action_area_border,
NULL);
if (!_gtk_container_get_border_width_set (GTK_CONTAINER (priv->vbox)))
{
gtk_container_set_border_width (GTK_CONTAINER (priv->vbox),
content_area_border);
_gtk_container_set_border_width_set (GTK_CONTAINER (priv->vbox), FALSE);
}
if (!_gtk_box_get_spacing_set (GTK_BOX (priv->vbox)))
{
gtk_box_set_spacing (GTK_BOX (priv->vbox), content_area_spacing);
@ -701,13 +657,6 @@ update_spacings (GtkDialog *dialog)
/* don't set spacing when buttons are linked */
if (gtk_button_box_get_layout (GTK_BUTTON_BOX (priv->action_area)) != GTK_BUTTONBOX_EXPAND)
gtk_box_set_spacing (GTK_BOX (priv->action_area), button_spacing);
if (!_gtk_container_get_border_width_set (GTK_CONTAINER (priv->action_area)))
{
gtk_container_set_border_width (GTK_CONTAINER (priv->action_area),
action_area_border);
_gtk_container_set_border_width_set (GTK_CONTAINER (priv->action_area), FALSE);
}
}
static void

1
gtk/gtkentry.c
View File

@ -2567,7 +2567,6 @@ gtk_entry_ensure_magnifier (GtkEntry *entry)
gtk_popover_set_modal (GTK_POPOVER (priv->magnifier_popover), FALSE);
gtk_container_add (GTK_CONTAINER (priv->magnifier_popover),
priv->magnifier);
gtk_container_set_border_width (GTK_CONTAINER (priv->magnifier_popover), 4);
gtk_widget_show (priv->magnifier);
}

3
gtk/gtkeventbox.c
View File

@ -91,7 +91,6 @@ gtk_event_box_class_init (GtkEventBoxClass *class)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (class);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
GtkContainerClass *container_class = GTK_CONTAINER_CLASS (class);
gobject_class->set_property = gtk_event_box_set_property;
gobject_class->get_property = gtk_event_box_get_property;
@ -106,8 +105,6 @@ gtk_event_box_class_init (GtkEventBoxClass *class)
widget_class->size_allocate = gtk_event_box_size_allocate;
widget_class->draw = gtk_event_box_draw;
gtk_container_class_handle_border_width (container_class);
g_object_class_install_property (gobject_class,
PROP_VISIBLE_WINDOW,
g_param_spec_boolean ("visible-window",

3
gtk/gtkfilechooserwidget.c
View File

@ -2681,10 +2681,7 @@ save_widgets_create (GtkFileChooserWidget *impl)
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
gtk_style_context_add_class (gtk_widget_get_style_context (vbox), "search-bar");
gtk_container_set_border_width (GTK_CONTAINER (vbox), 0);
priv->save_widgets_table = gtk_grid_new ();
gtk_container_set_border_width (GTK_CONTAINER (priv->save_widgets_table), 10);
gtk_box_pack_start (GTK_BOX (vbox), priv->save_widgets_table, FALSE, FALSE);
gtk_widget_show (priv->save_widgets_table);
gtk_grid_set_row_spacing (GTK_GRID (priv->save_widgets_table), 12);

1
gtk/gtkfixed.c
View File

@ -140,7 +140,6 @@ gtk_fixed_class_init (GtkFixedClass *class)
container_class->child_type = gtk_fixed_child_type;
container_class->set_child_property = gtk_fixed_set_child_property;
container_class->get_child_property = gtk_fixed_get_child_property;
gtk_container_class_handle_border_width (container_class);
gtk_container_class_install_child_property (container_class,
CHILD_PROP_X,

1
gtk/gtkflowbox.c
View File

@ -3798,7 +3798,6 @@ gtk_flow_box_class_init (GtkFlowBoxClass *class)
container_class->remove = gtk_flow_box_remove;
container_class->forall = gtk_flow_box_forall;
container_class->child_type = gtk_flow_box_child_type;
gtk_container_class_handle_border_width (container_class);
class->activate_cursor_child = gtk_flow_box_activate_cursor_child;
class->toggle_cursor_child = gtk_flow_box_toggle_cursor_child;

2
gtk/gtkframe.c
View File

@ -272,8 +272,6 @@ gtk_frame_class_init (GtkFrameClass *class)
container_class->remove = gtk_frame_remove;
container_class->forall = gtk_frame_forall;
gtk_container_class_handle_border_width (container_class);
class->compute_child_allocation = gtk_frame_real_compute_child_allocation;
gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_FRAME_ACCESSIBLE);

1
gtk/gtkgrid.c
View File

@ -1752,7 +1752,6 @@ gtk_grid_class_init (GtkGridClass *class)
container_class->child_type = gtk_grid_child_type;
container_class->set_child_property = gtk_grid_set_child_property;
container_class->get_child_property = gtk_grid_get_child_property;
gtk_container_class_handle_border_width (container_class);
g_object_class_override_property (object_class, PROP_ORIENTATION, "orientation");

1
gtk/gtkheaderbar.c
View File

@ -1984,7 +1984,6 @@ gtk_header_bar_class_init (GtkHeaderBarClass *class)
container_class->child_type = gtk_header_bar_child_type;
container_class->set_child_property = gtk_header_bar_set_child_property;
container_class->get_child_property = gtk_header_bar_get_child_property;
gtk_container_class_handle_border_width (container_class);
gtk_container_class_install_child_property (container_class,
CHILD_PROP_PACK_TYPE,

77
gtk/gtkmenu.c
View File

@ -2628,7 +2628,6 @@ gtk_menu_realize (GtkWidget *widget)
GdkWindow *window;
GdkWindowAttr attributes;
gint attributes_mask;
gint border_width;
GtkWidget *child;
GList *children;
GtkBorder arrow_border, padding;
@ -2657,16 +2656,13 @@ gtk_menu_realize (GtkWidget *widget)
gtk_widget_register_window (widget, window);
get_menu_padding (widget, &padding);
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
gtk_widget_get_allocation (widget, &allocation);
attributes.x = border_width + padding.left;
attributes.y = border_width + padding.top;
attributes.width = allocation.width -
(2 * border_width) - padding.left - padding.right;
attributes.height = allocation.height -
(2 * border_width) - padding.top - padding.bottom;
attributes.x = padding.left;
attributes.y = padding.top;
attributes.width = allocation.width - padding.left - padding.right;
attributes.height = allocation.height - padding.top - padding.bottom;
get_arrows_border (menu, &arrow_border);
attributes.y += arrow_border.top;
@ -2684,10 +2680,8 @@ gtk_menu_realize (GtkWidget *widget)
attributes.x = 0;
attributes.y = - priv->scroll_offset;
attributes.width = allocation.width + (2 * border_width) +
padding.left + padding.right;
attributes.height = priv->requested_height - (2 * border_width) +
padding.top + padding.bottom;
attributes.width = allocation.width + padding.left + padding.right;
attributes.height = priv->requested_height + padding.top + padding.bottom;
attributes.width = MAX (1, attributes.width);
attributes.height = MAX (1, attributes.height);
@ -2805,7 +2799,6 @@ calculate_line_heights (GtkMenu *menu,
GtkMenuShell *menu_shell;
GtkWidget *child, *widget;
GList *children;
guint border_width;
guint n_columns;
gint n_heights;
guint *min_heights;
@ -2824,8 +2817,7 @@ calculate_line_heights (GtkMenu *menu,
get_menu_padding (widget, &padding);
border_width = gtk_container_get_border_width (GTK_CONTAINER (menu));
avail_width -= (border_width) * 2 + padding.left + padding.right;
avail_width -= padding.left + padding.right;
for (children = menu_shell->priv->children; children; children = children->next)
{
@ -2881,7 +2873,6 @@ gtk_menu_size_allocate (GtkWidget *widget,
GList *children;
gint x, y, i;
gint width, height;
guint border_width;
GtkBorder arrow_border, padding;
g_return_if_fail (GTK_IS_MENU (widget));
@ -2894,7 +2885,6 @@ gtk_menu_size_allocate (GtkWidget *widget,
gtk_widget_set_allocation (widget, allocation);
get_menu_padding (widget, &padding);
border_width = gtk_container_get_border_width (GTK_CONTAINER (menu));
g_free (priv->heights);
priv->heights_length = calculate_line_heights (menu,
@ -2903,14 +2893,14 @@ gtk_menu_size_allocate (GtkWidget *widget,
NULL);
/* refresh our cached height request */
priv->requested_height = (2 * border_width) + padding.top + padding.bottom;
priv->requested_height = padding.top + padding.bottom;
for (i = 0; i < priv->heights_length; i++)
priv->requested_height += priv->heights[i];
x = border_width + padding.left;
y = border_width + padding.top;
width = allocation->width - (2 * border_width) - padding.left - padding.right;
height = allocation->height - (2 * border_width) - padding.top - padding.bottom;
x = padding.left;
y = padding.top;
width = allocation->width - padding.left - padding.right;
height = allocation->height - padding.top - padding.bottom;
if (menu_shell->priv->active)
gtk_menu_scroll_to (menu, priv->scroll_offset);
@ -3077,7 +3067,6 @@ gtk_menu_get_preferred_width (GtkWidget *widget,
GList *children;
guint max_toggle_size;
guint max_accel_width;
guint border_width;
gint child_min, child_nat;
gint min_width, nat_width;
GtkBorder padding;
@ -3160,9 +3149,8 @@ gtk_menu_get_preferred_width (GtkWidget *widget,
nat_width *= gtk_menu_get_n_columns (menu);
get_menu_padding (widget, &padding);
border_width = gtk_container_get_border_width (GTK_CONTAINER (menu));
min_width += (2 * border_width) + padding.left + padding.right;
nat_width += (2 * border_width) + padding.left + padding.right;
min_width += padding.left + padding.right;
nat_width += padding.left + padding.right;
priv->toggle_size = max_toggle_size;
priv->accel_size = max_accel_width;
@ -3195,14 +3183,12 @@ gtk_menu_get_preferred_height_for_width (GtkWidget *widget,
GtkMenu *menu = GTK_MENU (widget);
GtkMenuPrivate *priv = menu->priv;
guint *min_heights, *nat_heights;
guint border_width;
gint n_heights, i;
gint min_height, single_height, nat_height;
border_width = gtk_container_get_border_width (GTK_CONTAINER (menu));
get_menu_padding (widget, &padding);
min_height = nat_height = (2 * border_width) + padding.top + padding.bottom;
min_height = nat_height = padding.top + padding.bottom;
single_height = 0;
n_heights =
@ -3216,8 +3202,7 @@ gtk_menu_get_preferred_height_for_width (GtkWidget *widget,
}
get_arrows_border (menu, &arrow_border);
single_height += (2 * border_width)
+ padding.top + padding.bottom
single_height += padding.top + padding.bottom
+ arrow_border.top + arrow_border.bottom;
min_height = MIN (min_height, single_height);
@ -3605,7 +3590,6 @@ get_arrows_sensitive_area (GtkMenu *menu,
GtkWidget *widget = GTK_WIDGET (menu);
GdkWindow *window;
gint width, height;
guint border;
gint win_x, win_y;
GtkBorder padding;
gint top_arrow_height, bottom_arrow_height;
@ -3625,7 +3609,6 @@ get_arrows_sensitive_area (GtkMenu *menu,
width = gdk_window_get_width (window);
height = gdk_window_get_height (window);
border = gtk_container_get_border_width (GTK_CONTAINER (menu));
get_menu_padding (widget, &padding);
gdk_window_get_position (window, &win_x, &win_y);
@ -3635,15 +3618,15 @@ get_arrows_sensitive_area (GtkMenu *menu,
upper->x = win_x;
upper->y = win_y;
upper->width = width;
upper->height = top_arrow_height + border + padding.top;
upper->height = top_arrow_height + padding.top;
}
if (lower)
{
lower->x = win_x;
lower->y = win_y + height - border - padding.bottom - bottom_arrow_height;
lower->y = win_y + height - padding.bottom - bottom_arrow_height;
lower->width = width;
lower->height = bottom_arrow_height + border + padding.bottom;
lower->height = bottom_arrow_height + padding.bottom;
}
}
@ -4661,7 +4644,6 @@ gtk_menu_scroll_to (GtkMenu *menu,
GtkWidget *widget;
gint x, y;
gint view_width, view_height;
gint border_width;
widget = GTK_WIDGET (menu);
@ -4671,13 +4653,11 @@ gtk_menu_scroll_to (GtkMenu *menu,
get_menu_padding (widget, &padding);
border_width = gtk_container_get_border_width (GTK_CONTAINER (menu));
view_width -= padding.left + padding.right;
view_height -= padding.top + padding.bottom;
view_width -= (2 * border_width) + padding.left + padding.right;
view_height -= (2 * border_width) + padding.top + padding.bottom;
x = border_width + padding.left;
y = border_width + padding.top;
x = padding.left;
y = padding.top;
top_arrow_node = gtk_css_gadget_get_node (priv->top_arrow_gadget);
gtk_css_node_set_visible (top_arrow_node, priv->upper_arrow_visible);
@ -4762,8 +4742,7 @@ gtk_menu_scroll_item_visible (GtkMenuShell *menu_shell,
get_menu_padding (widget, &padding);
height -= 2 * gtk_container_get_border_width (GTK_CONTAINER (menu)) +
padding.top + padding.bottom;
height -= padding.top + padding.bottom;
if (child_offset < y)
{
@ -5072,16 +5051,13 @@ get_visible_size (GtkMenu *menu)
{
GtkAllocation allocation;
GtkWidget *widget = GTK_WIDGET (menu);
GtkContainer *container = GTK_CONTAINER (menu);
GtkBorder padding, arrow_border;
gint menu_height;
gtk_widget_get_allocation (widget, &allocation);
get_menu_padding (widget, &padding);
menu_height = (allocation.height -
(2 * gtk_container_get_border_width (container)) -
padding.top - padding.bottom);
menu_height = allocation.height - padding.top - padding.bottom;
get_arrows_border (menu, &arrow_border);
menu_height -= arrow_border.top;
@ -5146,8 +5122,7 @@ get_menu_height (GtkMenu *menu)
get_menu_padding (widget, &padding);
height = priv->requested_height;
height -= (gtk_container_get_border_width (GTK_CONTAINER (widget)) * 2) +
padding.top + padding.bottom;
height -= padding.top + padding.bottom;
get_arrows_border (menu, &arrow_border);
height -= arrow_border.top;

3
gtk/gtkmenubar.c
View File

@ -138,14 +138,12 @@ gtk_menu_bar_class_init (GtkMenuBarClass *class)
GObjectClass *gobject_class;
GtkWidgetClass *widget_class;
GtkMenuShellClass *menu_shell_class;
GtkContainerClass *container_class;
GtkBindingSet *binding_set;
gobject_class = (GObjectClass*) class;
widget_class = (GtkWidgetClass*) class;
menu_shell_class = (GtkMenuShellClass*) class;
container_class = (GtkContainerClass*) class;
gobject_class->get_property = gtk_menu_bar_get_property;
gobject_class->set_property = gtk_menu_bar_set_property;
@ -239,7 +237,6 @@ gtk_menu_bar_class_init (GtkMenuBarClass *class)
GTK_PACK_DIRECTION_LTR,
GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY));
gtk_container_class_handle_border_width (container_class);
gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_MENU_BAR);
gtk_widget_class_set_css_name (widget_class, "menubar");
}

2
gtk/gtkmenuitem.c
View File

@ -814,8 +814,6 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass)
gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_MENU_ITEM_ACCESSIBLE);
gtk_widget_class_set_css_name (widget_class, "menuitem");
gtk_container_class_handle_border_width (container_class);
}
static void

34
gtk/gtkmessagedialog.c
View File

@ -110,8 +110,6 @@ struct _GtkMessageDialogPrivate
guint message_type : 3;
};
static void gtk_message_dialog_style_updated (GtkWidget *widget);
static void gtk_message_dialog_constructed (GObject *object);
static void gtk_message_dialog_set_property (GObject *object,
guint prop_id,
@ -161,23 +159,12 @@ gtk_message_dialog_class_init (GtkMessageDialogClass *class)
widget_class = GTK_WIDGET_CLASS (class);
gobject_class = G_OBJECT_CLASS (class);
widget_class->style_updated = gtk_message_dialog_style_updated;
gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_ALERT);
gobject_class->constructed = gtk_message_dialog_constructed;
gobject_class->set_property = gtk_message_dialog_set_property;
gobject_class->get_property = gtk_message_dialog_get_property;
gtk_widget_class_install_style_property (widget_class,
g_param_spec_int ("message-border",
P_("label border"),
P_("Width of border around the label in the message dialog"),
0,
G_MAXINT,
12,
GTK_PARAM_READABLE));
/**
* GtkMessageDialog:message-type:
*
@ -323,7 +310,6 @@ gtk_message_dialog_init (GtkMessageDialog *dialog)
priv->message_type = GTK_MESSAGE_OTHER;
gtk_widget_init_template (GTK_WIDGET (dialog));
gtk_message_dialog_style_updated (GTK_WIDGET (dialog));
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
G_GNUC_END_IGNORE_DEPRECATIONS
@ -971,23 +957,3 @@ gtk_message_dialog_add_buttons (GtkMessageDialog* message_dialog,
g_object_notify (G_OBJECT (message_dialog), "buttons");
}
static void
gtk_message_dialog_style_updated (GtkWidget *widget)
{
GtkMessageDialog *dialog = GTK_MESSAGE_DIALOG (widget);
GtkWidget *parent;
gint border_width;
parent = gtk_widget_get_parent (dialog->priv->message_area);
if (parent)
{
gtk_widget_style_get (widget, "message-border",
&border_width, NULL);
gtk_container_set_border_width (GTK_CONTAINER (parent),
MAX (0, border_width - 7));
}
GTK_WIDGET_CLASS (gtk_message_dialog_parent_class)->style_updated (widget);
}

4
gtk/gtkmountoperation.c
View File

@ -532,9 +532,7 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
G_GNUC_END_IGNORE_DEPRECATIONS
/* Set the dialog up with HIG properties */
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
gtk_box_set_spacing (GTK_BOX (content_area), 2); /* 2 * 5 + 2 = 12 */
gtk_container_set_border_width (GTK_CONTAINER (action_area), 5);
gtk_box_set_spacing (GTK_BOX (action_area), 6);
gtk_window_set_resizable (window, FALSE);
@ -550,7 +548,6 @@ G_GNUC_END_IGNORE_DEPRECATIONS
/* Build contents */
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE);
icon = gtk_image_new_from_icon_name ("dialog-password",
@ -1407,7 +1404,6 @@ create_show_processes_dialog (GtkMountOperation *op,
content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE);
if (secondary != NULL)

2
gtk/gtknotebook.c
View File

@ -1152,8 +1152,6 @@ gtk_notebook_class_init (GtkNotebookClass *class)
add_tab_bindings (binding_set, GDK_CONTROL_MASK, GTK_DIR_TAB_FORWARD);
add_tab_bindings (binding_set, GDK_CONTROL_MASK | GDK_SHIFT_MASK, GTK_DIR_TAB_BACKWARD);
gtk_container_class_handle_border_width (container_class);
gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_NOTEBOOK_ACCESSIBLE);
gtk_widget_class_set_css_name (widget_class, "notebook");
}

25
gtk/gtkoffscreenwindow.c
View File

@ -56,13 +56,10 @@ gtk_offscreen_window_get_preferred_width (GtkWidget *widget,
{
GtkBin *bin = GTK_BIN (widget);
GtkWidget *child;
gint border_width;
gint default_width;
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
*minimum = border_width * 2;
*natural = border_width * 2;
*minimum = 0;
*natural = 0;
child = gtk_bin_get_child (bin);
@ -90,13 +87,10 @@ gtk_offscreen_window_get_preferred_height (GtkWidget *widget,
{
GtkBin *bin = GTK_BIN (widget);
GtkWidget *child;
gint border_width;
gint default_height;
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
*minimum = border_width * 2;
*natural = border_width * 2;
*minimum = 0;
*natural = 0;
child = gtk_bin_get_child (bin);
@ -123,12 +117,9 @@ gtk_offscreen_window_size_allocate (GtkWidget *widget,
{
GtkBin *bin = GTK_BIN (widget);
GtkWidget *child;
gint border_width;
gtk_widget_set_allocation (widget, allocation);
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
if (gtk_widget_get_realized (widget))
gdk_window_move_resize (gtk_widget_get_window (widget),
allocation->x,
@ -142,10 +133,10 @@ gtk_offscreen_window_size_allocate (GtkWidget *widget,
{
GtkAllocation child_alloc;
child_alloc.x = border_width;
child_alloc.y = border_width;
child_alloc.width = allocation->width - 2 * border_width;
child_alloc.height = allocation->height - 2 * border_width;
child_alloc.x = 0;
child_alloc.y = 0;
child_alloc.width = allocation->width;
child_alloc.height = allocation->height;
gtk_widget_size_allocate (child, &child_alloc);
}

1
gtk/gtkpaned.c
View File

@ -349,7 +349,6 @@ gtk_paned_class_init (GtkPanedClass *class)
container_class->set_focus_child = gtk_paned_set_focus_child;
container_class->set_child_property = gtk_paned_set_child_property;
container_class->get_child_property = gtk_paned_get_child_property;
gtk_container_class_handle_border_width (container_class);
paned_class->cycle_child_focus = gtk_paned_cycle_child_focus;
paned_class->toggle_handle_focus = gtk_paned_toggle_handle_focus;

1
gtk/gtkpathbar.c
View File

@ -237,7 +237,6 @@ gtk_path_bar_class_init (GtkPathBarClass *path_bar_class)
container_class->add = gtk_path_bar_add;
container_class->forall = gtk_path_bar_forall;
container_class->remove = gtk_path_bar_remove;
gtk_container_class_handle_border_width (container_class);
/* FIXME: */
/* container_class->child_type = gtk_path_bar_child_type;*/

1
gtk/gtkplacesview.c
View File

@ -569,7 +569,6 @@ populate_servers (GtkPlacesView *view)
grid = g_object_new (GTK_TYPE_GRID,
"orientation", GTK_ORIENTATION_VERTICAL,
"border-width", 3,
NULL);
/* name of the connected uri, if any */

11
gtk/gtkpopover.c
View File

@ -1223,19 +1223,16 @@ get_padding_and_border (GtkWidget *widget,
GtkBorder *border)
{
GtkStyleContext *context;
gint border_width;
GtkBorder tmp;
context = gtk_widget_get_style_context (widget);
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
gtk_style_context_get_padding (context, border);
gtk_style_context_get_border (context, &tmp);
border->top += tmp.top + border_width;
border->right += tmp.right + border_width;
border->bottom += tmp.bottom + border_width;
border->left += tmp.left + border_width;
border->top += tmp.top;
border->right += tmp.right;
border->bottom += tmp.bottom;
border->left += tmp.left;
}
static gint

8
gtk/gtkrecentchooserdialog.c
View File

@ -127,7 +127,7 @@ static void
gtk_recent_chooser_dialog_init (GtkRecentChooserDialog *dialog)
{
GtkRecentChooserDialogPrivate *priv;
GtkWidget *content_area, *action_area;
GtkWidget *content_area;
GtkDialog *rc_dialog = GTK_DIALOG (dialog);
priv = gtk_recent_chooser_dialog_get_instance_private (dialog);
@ -135,13 +135,8 @@ gtk_recent_chooser_dialog_init (GtkRecentChooserDialog *dialog)
gtk_dialog_set_use_header_bar_from_setting (GTK_DIALOG (dialog));
content_area = gtk_dialog_get_content_area (rc_dialog);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
action_area = gtk_dialog_get_action_area (rc_dialog);
G_GNUC_END_IGNORE_DEPRECATIONS
gtk_container_set_border_width (GTK_CONTAINER (rc_dialog), 5);
gtk_box_set_spacing (GTK_BOX (content_area), 2); /* 2 * 5 + 2 = 12 */
gtk_container_set_border_width (GTK_CONTAINER (action_area), 5);
}
/* we intercept the GtkRecentChooser::item_activated signal and try to
@ -213,7 +208,6 @@ gtk_recent_chooser_dialog_constructed (GObject *object)
content_area = gtk_dialog_get_content_area (GTK_DIALOG (object));
gtk_container_set_border_width (GTK_CONTAINER (priv->chooser), 5);
gtk_box_pack_start (GTK_BOX (content_area),
priv->chooser, TRUE, TRUE);
gtk_widget_show (priv->chooser);

1
gtk/gtkscrolledwindow.c
View File

@ -556,7 +556,6 @@ gtk_scrolled_window_class_init (GtkScrolledWindowClass *class)
container_class->add = gtk_scrolled_window_add;
container_class->remove = gtk_scrolled_window_remove;
container_class->forall = gtk_scrolled_window_forall;
gtk_container_class_handle_border_width (container_class);
class->scroll_child = gtk_scrolled_window_scroll_child;
class->move_focus_out = gtk_scrolled_window_move_focus_out;

1
gtk/gtkshortcutssection.c
View File

@ -428,7 +428,6 @@ gtk_shortcuts_section_init (GtkShortcutsSection *self)
gtk_orientable_set_orientation (GTK_ORIENTABLE (self), GTK_ORIENTATION_VERTICAL);
gtk_box_set_homogeneous (GTK_BOX (self), FALSE);
gtk_box_set_spacing (GTK_BOX (self), 22);
gtk_container_set_border_width (GTK_CONTAINER (self), 24);
self->stack = g_object_new (GTK_TYPE_STACK,
"homogeneous", TRUE,

2
gtk/gtkshortcutswindow.c
View File

@ -963,7 +963,6 @@ gtk_shortcuts_window_init (GtkShortcutsWindow *self)
G_GNUC_END_IGNORE_DEPRECATIONS;
priv->popover = g_object_new (GTK_TYPE_POPOVER,
"border-width", 6,
"relative-to", priv->menu_button,
"position", GTK_POS_BOTTOM,
NULL);
@ -1002,7 +1001,6 @@ gtk_shortcuts_window_init (GtkShortcutsWindow *self)
"visible", TRUE,
NULL);
box = g_object_new (GTK_TYPE_BOX,
"border-width", 24,
"halign", GTK_ALIGN_CENTER,
"spacing", 24,
"orientation", GTK_ORIENTATION_VERTICAL,

2
gtk/gtkspinbutton.c
View File

@ -134,7 +134,6 @@
* adjustment = gtk_adjustment_new (50.0, 0.0, 100.0, 1.0, 5.0, 0.0);
*
* window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
* gtk_container_set_border_width (GTK_CONTAINER (window), 5);
*
* // creates the spinbutton, with no decimal places
* button = gtk_spin_button_new (adjustment, 1.0, 0);
@ -166,7 +165,6 @@
* adjustment = gtk_adjustment_new (2.500, 0.0, 5.0, 0.001, 0.1, 0.0);
*
* window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
* gtk_container_set_border_width (GTK_CONTAINER (window), 5);
*
* // creates the spinbutton, with three decimal places
* button = gtk_spin_button_new (adjustment, 0.001, 3);

1
gtk/gtkstack.c
View File

@ -452,7 +452,6 @@ gtk_stack_class_init (GtkStackClass *klass)
container_class->forall = gtk_stack_forall;
container_class->set_child_property = gtk_stack_set_child_property;
container_class->get_child_property = gtk_stack_get_child_property;
gtk_container_class_handle_border_width (container_class);
stack_props[PROP_HOMOGENEOUS] =
g_param_spec_boolean ("homogeneous", P_("Homogeneous"), P_("Homogeneous sizing"),

17
gtk/gtktextview.c
View File

@ -1802,7 +1802,6 @@ _gtk_text_view_ensure_magnifier (GtkTextView *text_view)
gtk_popover_set_modal (GTK_POPOVER (priv->magnifier_popover), FALSE);
gtk_container_add (GTK_CONTAINER (priv->magnifier_popover),
priv->magnifier);
gtk_container_set_border_width (GTK_CONTAINER (priv->magnifier_popover), 4);
gtk_widget_show (priv->magnifier);
}
@ -3976,7 +3975,6 @@ gtk_text_view_size_request (GtkWidget *widget,
GtkTextView *text_view;
GtkTextViewPrivate *priv;
GSList *tmp_list;
guint border_width;
text_view = GTK_TEXT_VIEW (widget);
priv = text_view->priv;
@ -4007,10 +4005,6 @@ gtk_text_view_size_request (GtkWidget *widget,
if (priv->bottom_window)
requisition->height += priv->bottom_window->requisition.height;
border_width = gtk_container_get_border_width (GTK_CONTAINER (text_view));
requisition->width += border_width * 2;
requisition->height += border_width * 2;
requisition->height += priv->top_border + priv->bottom_border;
requisition->width += priv->left_border + priv->right_border;
@ -4231,7 +4225,6 @@ gtk_text_view_size_allocate (GtkWidget *widget,
GdkRectangle right_rect;
GdkRectangle top_rect;
GdkRectangle bottom_rect;
guint border_width;
gboolean size_changed;
text_view = GTK_TEXT_VIEW (widget);
@ -4247,8 +4240,6 @@ gtk_text_view_size_allocate (GtkWidget *widget,
widget_allocation.width != allocation->width ||
widget_allocation.height != allocation->height;
border_width = gtk_container_get_border_width (GTK_CONTAINER (text_view));
gtk_widget_set_allocation (widget, allocation);
if (gtk_widget_get_realized (widget))
@ -4262,7 +4253,7 @@ gtk_text_view_size_allocate (GtkWidget *widget,
* windows get at least a 1x1 allocation.
*/
width = allocation->width - border_width * 2;
width = allocation->width;
if (priv->left_window)
left_rect.width = priv->left_window->requisition.width;
@ -4283,7 +4274,7 @@ gtk_text_view_size_allocate (GtkWidget *widget,
top_rect.width = text_rect.width;
bottom_rect.width = text_rect.width;
height = allocation->height - border_width * 2;
height = allocation->height;
if (priv->top_window)
top_rect.height = priv->top_window->requisition.height;
@ -4305,8 +4296,8 @@ gtk_text_view_size_allocate (GtkWidget *widget,
right_rect.height = text_rect.height;
/* Origins */
left_rect.x = border_width;
top_rect.y = border_width;
left_rect.x = 0;
top_rect.y = 0;
text_rect.x = left_rect.x + left_rect.width;
text_rect.y = top_rect.y + top_rect.height;

2
gtk/gtktoolbar.c
View File

@ -433,8 +433,6 @@ gtk_toolbar_class_init (GtkToolbarClass *klass)
container_class->get_child_property = gtk_toolbar_get_child_property;
container_class->set_child_property = gtk_toolbar_set_child_property;
gtk_container_class_handle_border_width (container_class);
klass->orientation_changed = gtk_toolbar_orientation_changed;
klass->style_changed = gtk_toolbar_real_style_changed;

2
gtk/gtktoolitem.c
View File

@ -169,8 +169,6 @@ gtk_tool_item_class_init (GtkToolItemClass *klass)
widget_class->size_allocate = gtk_tool_item_size_allocate;
widget_class->parent_set = gtk_tool_item_parent_set;
gtk_container_class_handle_border_width (GTK_CONTAINER_CLASS (klass));
klass->create_menu_proxy = _gtk_tool_item_create_menu_proxy;
g_object_class_install_property (object_class,

44
gtk/gtktoolitemgroup.c
View File

@ -582,7 +582,6 @@ gtk_tool_item_group_size_request (GtkWidget *widget,
GtkOrientation orientation;
GtkRequisition item_size;
gint requested_rows;
guint border_width;
if (priv->children && gtk_tool_item_group_get_label_widget (group))
{
@ -604,10 +603,6 @@ gtk_tool_item_group_size_request (GtkWidget *widget,
requisition->width = MAX (requisition->width, item_size.width);
else
requisition->height = MAX (requisition->height, item_size.height * requested_rows);
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
requisition->width += border_width * 2;
requisition->height += border_width * 2;
}
static void
@ -679,9 +674,7 @@ gtk_tool_item_group_real_size_query (GtkWidget *widget,
GtkOrientation orientation;
gint min_rows;
guint border_width;
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
orientation = gtk_tool_shell_get_orientation (GTK_TOOL_SHELL (group));
/* figure out the size of homogeneous items */
@ -713,7 +706,7 @@ gtk_tool_item_group_real_size_query (GtkWidget *widget,
gint row = -1;
guint col = 0;
item_area.width = allocation->width - 2 * border_width;
item_area.width = allocation->width;
n_columns = MAX (item_area.width / item_size.width, 1);
/* calculate required rows for n_columns columns */
@ -770,7 +763,7 @@ gtk_tool_item_group_real_size_query (GtkWidget *widget,
guint col = 0, min_col, max_col = 0, all_items = 0;
gint i;
item_area.height = allocation->height - 2 * border_width;
item_area.height = allocation->height;
n_rows = MAX (item_area.height / item_size.height, min_rows);
row_min_width = g_new0 (guint, n_rows);
@ -907,8 +900,8 @@ gtk_tool_item_group_real_size_query (GtkWidget *widget,
}
/* report effective widget size */
inquery->width += item_area.width + 2 * border_width;
inquery->height += item_area.height + 2 * border_width;
inquery->width += item_area.width;
inquery->height += item_area.height;
}
static void
@ -929,11 +922,8 @@ gtk_tool_item_group_real_size_allocate (GtkWidget *widget,
gint n_columns, n_rows = 1;
gint min_rows;
guint border_width;
GtkTextDirection direction;
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
direction = gtk_widget_get_direction (widget);
orientation = gtk_tool_shell_get_orientation (GTK_TOOL_SHELL (group));
@ -941,8 +931,8 @@ gtk_tool_item_group_real_size_allocate (GtkWidget *widget,
/* chain up */
GTK_WIDGET_CLASS (gtk_tool_item_group_parent_class)->size_allocate (widget, allocation);
child_allocation.x = border_width;
child_allocation.y = border_width;
child_allocation.x = 0;
child_allocation.y = 0;
/* place the header widget */
if (gtk_widget_get_visible (priv->header))
@ -961,7 +951,7 @@ gtk_tool_item_group_real_size_allocate (GtkWidget *widget,
child_allocation.height = allocation->height;
if (GTK_TEXT_DIR_RTL == direction)
child_allocation.x = allocation->width - border_width - child_allocation.width;
child_allocation.x = allocation->width - child_allocation.width;
}
gtk_widget_size_allocate (priv->header, &child_allocation);
@ -971,7 +961,7 @@ gtk_tool_item_group_real_size_allocate (GtkWidget *widget,
else if (GTK_TEXT_DIR_RTL != direction)
child_allocation.x += child_allocation.width;
else
child_allocation.x = border_width;
child_allocation.x = 0;
}
else
child_requisition.width = child_requisition.height = 0;
@ -987,8 +977,8 @@ gtk_tool_item_group_real_size_allocate (GtkWidget *widget,
{
item_size.width = MIN (item_size.width, allocation->width);
item_area.width = allocation->width - 2 * border_width;
item_area.height = allocation->height - 2 * border_width - child_requisition.height;
item_area.width = allocation->width;
item_area.height = allocation->height - child_requisition.height;
n_columns = MAX (item_area.width / item_size.width, 1);
@ -998,8 +988,8 @@ gtk_tool_item_group_real_size_allocate (GtkWidget *widget,
{
item_size.height = MIN (item_size.height, allocation->height);
item_area.width = allocation->width - 2 * border_width - child_requisition.width;
item_area.height = allocation->height - 2 * border_width;
item_area.width = allocation->width - child_requisition.width;
item_area.height = allocation->height;
n_columns = MAX (item_area.width / item_size.width, 1);
n_rows = MAX (item_area.height / item_size.height, min_rows);
@ -1242,18 +1232,16 @@ gtk_tool_item_group_realize (GtkWidget *widget)
GdkWindow *window;
GdkWindowAttr attributes;
gint attributes_mask;
guint border_width;
gtk_widget_set_realized (widget, TRUE);
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
gtk_widget_get_allocation (widget, &allocation);
attributes.window_type = GDK_WINDOW_CHILD;
attributes.x = allocation.x + border_width;
attributes.y = allocation.y + border_width;
attributes.width = allocation.width - border_width * 2;
attributes.height = allocation.height - border_width * 2;
attributes.x = allocation.x;
attributes.y = allocation.y;
attributes.width = allocation.width;
attributes.height = allocation.height;
attributes.wclass = GDK_INPUT_OUTPUT;
attributes.event_mask = gtk_widget_get_events (widget)
| GDK_VISIBILITY_NOTIFY_MASK

29
gtk/gtktoolpalette.c
View File

@ -420,11 +420,8 @@ gtk_tool_palette_size_request (GtkWidget *widget,
{
GtkToolPalette *palette = GTK_TOOL_PALETTE (widget);
GtkRequisition child_requisition;
guint border_width;
guint i;
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
requisition->width = 0;
requisition->height = 0;
@ -449,9 +446,6 @@ gtk_tool_palette_size_request (GtkWidget *widget,
requisition->height = MAX (requisition->height, child_requisition.height);
}
}
requisition->width += border_width * 2;
requisition->height += border_width * 2;
}
static void
@ -494,7 +488,6 @@ gtk_tool_palette_size_allocate (GtkWidget *widget,
gint total_size, page_size;
gint offset = 0;
guint i;
guint border_width;
gint min_offset = -1, max_offset = -1;
@ -503,7 +496,6 @@ gtk_tool_palette_size_allocate (GtkWidget *widget,
gint *group_sizes = g_newa (gint, palette->priv->groups->len);
GtkTextDirection direction;
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
direction = gtk_widget_get_direction (widget);
GTK_WIDGET_CLASS (gtk_tool_palette_parent_class)->size_allocate (widget, allocation);
@ -526,9 +518,9 @@ gtk_tool_palette_size_allocate (GtkWidget *widget,
offset = -offset;
if (GTK_ORIENTATION_VERTICAL == palette->priv->orientation)
child_allocation.width = allocation->width - border_width * 2;
child_allocation.width = allocation->width;
else
child_allocation.height = allocation->height - border_width * 2;
child_allocation.height = allocation->height;
if (GTK_ORIENTATION_VERTICAL == palette->priv->orientation)
remaining_space = allocation->height;
@ -613,8 +605,8 @@ gtk_tool_palette_size_allocate (GtkWidget *widget,
if (remaining_space > 0)
offset = 0;
x = border_width;
child_allocation.y = border_width;
x = 0;
child_allocation.y = 0;
if (GTK_ORIENTATION_VERTICAL == palette->priv->orientation)
child_allocation.y -= offset;
@ -664,14 +656,12 @@ gtk_tool_palette_size_allocate (GtkWidget *widget,
if (GTK_ORIENTATION_VERTICAL == palette->priv->orientation)
{
child_allocation.y += border_width;
child_allocation.y += offset;
total_size = child_allocation.y;
}
else
{
x += border_width;
x += offset;
total_size = x;
@ -716,19 +706,16 @@ gtk_tool_palette_realize (GtkWidget *widget)
GdkWindow *window;
GdkWindowAttr attributes;
gint attributes_mask;
guint border_width;
gtk_widget_set_realized (widget, TRUE);
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
gtk_widget_get_allocation (widget, &allocation);
attributes.window_type = GDK_WINDOW_CHILD;
attributes.x = allocation.x + border_width;
attributes.y = allocation.y + border_width;
attributes.width = allocation.width - border_width * 2;
attributes.height = allocation.height - border_width * 2;
attributes.x = allocation.x;
attributes.y = allocation.y;
attributes.width = allocation.width;
attributes.height = allocation.height;
attributes.wclass = GDK_INPUT_OUTPUT;
attributes.event_mask = gtk_widget_get_events (widget)
| GDK_VISIBILITY_NOTIFY_MASK

1
gtk/gtktreeview.c
View File

@ -11203,7 +11203,6 @@ gtk_tree_view_ensure_interactive_directory (GtkTreeView *tree_view)
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show (vbox);
gtk_container_add (GTK_CONTAINER (frame), vbox);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 3);
/* add entry */
tree_view->priv->search_entry = gtk_entry_new ();

1
gtk/gtkviewport.c
View File

@ -394,7 +394,6 @@ gtk_viewport_class_init (GtkViewportClass *class)
container_class->remove = gtk_viewport_remove;
container_class->add = gtk_viewport_add;
gtk_container_class_handle_border_width (container_class);
/* GtkScrollable implementation */
g_object_class_override_property (gobject_class, PROP_HADJUSTMENT, "hadjustment");

43
gtk/gtkwindow.c
View File

@ -7294,7 +7294,6 @@ _gtk_window_set_allocation (GtkWindow *window,
GtkWidget *widget = (GtkWidget *)window;
GtkWindowPrivate *priv = window->priv;
GtkAllocation child_allocation;
gint border_width;
GtkBorder window_border = { 0 };
GList *link;
@ -7356,12 +7355,6 @@ _gtk_window_set_allocation (GtkWindow *window,
allocation->width, allocation->height);
}
border_width = gtk_container_get_border_width (GTK_CONTAINER (window));
child_allocation.x += border_width;
child_allocation.y += border_width;
child_allocation.width = MAX (1, child_allocation.width - border_width * 2);
child_allocation.height = MAX (1, child_allocation.height - border_width * 2);
*allocation_out = child_allocation;
link = priv->popovers;
@ -8174,7 +8167,6 @@ gtk_window_get_preferred_width (GtkWidget *widget,
GtkWindow *window;
GtkWidget *child;
GtkWindowPrivate *priv;
guint border_width;
gint title_min = 0, title_nat = 0;
gint child_min = 0, child_nat = 0;
GtkBorder window_border = { 0 };
@ -8185,8 +8177,6 @@ gtk_window_get_preferred_width (GtkWidget *widget,
child = gtk_bin_get_child (GTK_BIN (window));
has_size_request = gtk_widget_has_size_request (widget);
border_width = gtk_container_get_border_width (GTK_CONTAINER (window));
if (priv->decorated &&
!priv->fullscreen)
{
@ -8208,10 +8198,8 @@ gtk_window_get_preferred_width (GtkWidget *widget,
if (child_nat == 0 && !has_size_request)
child_nat = NO_CONTENT_CHILD_NAT;
child_min += border_width * 2 +
window_border.left + window_border.right;
child_nat += border_width * 2 +
window_border.left + window_border.right;
child_min += window_border.left + window_border.right;
child_nat += window_border.left + window_border.right;
}
else if (!has_size_request)
{
@ -8232,7 +8220,6 @@ gtk_window_get_preferred_width_for_height (GtkWidget *widget,
GtkWindow *window;
GtkWidget *child;
GtkWindowPrivate *priv;
guint border_width;
gint title_min = 0, title_nat = 0;
gint child_min = 0, child_nat = 0;
gint title_height = 0;
@ -8244,10 +8231,6 @@ gtk_window_get_preferred_width_for_height (GtkWidget *widget,
child = gtk_bin_get_child (GTK_BIN (window));
has_size_request = gtk_widget_has_size_request (widget);
border_width = gtk_container_get_border_width (GTK_CONTAINER (window));
height -= 2 * border_width;
if (priv->decorated &&
!priv->fullscreen)
{
@ -8279,10 +8262,8 @@ gtk_window_get_preferred_width_for_height (GtkWidget *widget,
if (child_nat == 0 && height == 0 && !has_size_request)
child_nat = NO_CONTENT_CHILD_NAT;
child_min += border_width * 2 +
window_border.left + window_border.right;
child_nat += border_width * 2 +
window_border.left + window_border.right;
child_min += window_border.left + window_border.right;
child_nat += window_border.left + window_border.right;
}
else if (!has_size_request)
{
@ -8301,7 +8282,6 @@ gtk_window_get_preferred_height (GtkWidget *widget,
GtkWindow *window;
GtkWindowPrivate *priv;
GtkWidget *child;
guint border_width;
int title_min = 0;
int title_height = 0;
GtkBorder window_border = { 0 };
@ -8315,8 +8295,6 @@ gtk_window_get_preferred_height (GtkWidget *widget,
*minimum_size = 0;
*natural_size = 0;
border_width = gtk_container_get_border_width (GTK_CONTAINER (window));
if (priv->decorated &&
!priv->fullscreen)
{
@ -8343,8 +8321,8 @@ gtk_window_get_preferred_height (GtkWidget *widget,
if (child_nat == 0 && !has_size_request)
child_nat = NO_CONTENT_CHILD_NAT;
*minimum_size += child_min + 2 * border_width;
*natural_size += child_nat + 2 * border_width;
*minimum_size += child_min;
*natural_size += child_nat;
}
else if (!has_size_request)
{
@ -8362,7 +8340,6 @@ gtk_window_get_preferred_height_for_width (GtkWidget *widget,
GtkWindow *window;
GtkWindowPrivate *priv;
GtkWidget *child;
guint border_width;
int title_min = 0;
int title_height = 0;
GtkBorder window_border = { 0 };
@ -8376,10 +8353,6 @@ gtk_window_get_preferred_height_for_width (GtkWidget *widget,
*minimum_size = 0;
*natural_size = 0;
border_width = gtk_container_get_border_width (GTK_CONTAINER (window));
width -= 2 * border_width;
if (priv->decorated &&
!priv->fullscreen)
{
@ -8410,8 +8383,8 @@ gtk_window_get_preferred_height_for_width (GtkWidget *widget,
if (child_nat == 0 && width == 0 && !has_size_request)
child_nat = NO_CONTENT_CHILD_NAT;
*minimum_size += child_min + 2 * border_width;
*natural_size += child_nat + 2 * border_width;
*minimum_size += child_min;
*natural_size += child_nat;
}
else if (!has_size_request)
{

3
gtk/ui/gtkaboutdialog.ui
View File

@ -6,7 +6,6 @@
<property name="icon-name">help-about</property>
</object>
<template class="GtkAboutDialog" parent="GtkDialog">
<property name="border-width">5</property>
<property name="resizable">0</property>
<property name="type-hint">dialog</property>
<child internal-child="headerbar">
@ -28,7 +27,6 @@
<child>
<object class="GtkBox" id="box">
<property name="visible">1</property>
<property name="border-width">5</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
@ -169,7 +167,6 @@
<property name="visible">1</property>
<property name="halign">center</property>
<property name="valign">start</property>
<property name="border-width">5</property>
<property name="orientation">vertical</property>
<property name="row-spacing">2</property>
<property name="column-spacing">8</property>

2
gtk/ui/gtkcolorchooserdialog.ui
View File

@ -2,7 +2,6 @@
<interface domain="gtk30">
<!-- interface-requires gtk+ 3.10 -->
<template class="GtkColorChooserDialog" parent="GtkDialog">
<property name="border-width">5</property>
<property name="title" translatable="yes">Select a Color</property>
<property name="type-hint">dialog</property>
<property name="resizable">0</property>
@ -13,7 +12,6 @@
<child>
<object class="GtkColorChooserWidget" id="chooser">
<property name="visible">1</property>
<property name="border-width">5</property>
<property name="orientation">vertical</property>
<property name="rgba">rgb(255,255,255)</property>
<signal name="color-activated" handler="color_activated_cb" swapped="no"/>

1
gtk/ui/gtkdialog.ui
View File

@ -15,7 +15,6 @@
<object class="GtkBox" id="vbox">
<property name="visible">1</property>
<property name="orientation">vertical</property>
<property name="border-width">0</property>
<style>
<class name="dialog-vbox"/>
</style>

2
gtk/ui/gtkfilechooserdialog.ui
View File

@ -9,10 +9,8 @@
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="orientation">vertical</property>
<property name="border-width">0</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="border-width">6</property>
<property name="layout-style">end</property>
</object>
<packing>

3
gtk/ui/gtkfilechooserwidget.ui
View File

@ -54,7 +54,6 @@
<object class="GtkBox">
<property name="visible">1</property>
<property name="spacing">6</property>
<property name="border-width">6</property>
<child>
<object class="GtkPathBar" id="browse_path_bar">
<property name="visible">True</property>
@ -94,7 +93,6 @@
<property name="visible">1</property>
<property name="no-show-all">1</property>
<property name="spacing">6</property>
<property name="border-width">6</property>
</object>
<packing>
<property name="name">location</property>
@ -105,7 +103,6 @@
<property name="visible">1</property>
<property name="no-show-all">1</property>
<property name="spacing">6</property>
<property name="border-width">6</property>
<child type="center">
<object class="GtkSearchEntry" id="search_entry">
<property name="visible">1</property>

2
gtk/ui/gtkfontchooserdialog.ui
View File

@ -2,7 +2,6 @@
<interface domain="gtk30">
<!-- interface-requires gtk+ 3.10 -->
<template class="GtkFontChooserDialog" parent="GtkDialog">
<property name="border-width">5</property>
<property name="title" translatable="yes">Select Font</property>
<property name="type-hint">dialog</property>
<child internal-child="vbox">
@ -12,7 +11,6 @@
<child>
<object class="GtkFontChooserWidget" id="fontchooser">
<property name="visible">1</property>
<property name="border-width">5</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<signal name="font-activated" handler="font_activated_cb" swapped="no"/>

3
gtk/ui/gtkinfobar.ui
View File

@ -11,7 +11,6 @@
<child>
<object class="GtkBox" id="content_area">
<property name="visible">1</property>
<property name="border-width">8</property>
<property name="spacing">16</property>
<property name="hexpand">1</property>
</object>
@ -22,7 +21,6 @@
<child>
<object class="GtkButtonBox" id="action_area">
<property name="visible">1</property>
<property name="border-width">6</property>
<property name="spacing">6</property>
<property name="layout-style">end</property>
</object>
@ -33,7 +31,6 @@
<child>
<object class="GtkButton" id="close_button">
<property name="can-focus">1</property>
<property name="border-width">6</property>
<property name="relief">none</property>
<property name="valign">center</property>
<style>

1
gtk/ui/gtkmessagedialog.ui
View File

@ -15,7 +15,6 @@
<object class="GtkBox" id="dialog-vbox1">
<property name="orientation">vertical</property>
<property name="spacing">20</property>
<property name="border-width">0</property>
<child>
<object class="GtkBox" id="box">
<property name="visible">1</property>

Some files were not shown because too many files have changed in this diff Show More