Author: cazfi
Date: Sat Apr 1 10:17:50 2017
New Revision: 35175
URL: http://svn.gna.org/viewcvs/freeciv?rev=35175&view=rev
Log:
Drop fifth parameter from gtk_box_pack_start() calls
See hrm Feature #647926
Modified:
trunk/client/gui-gtk-4.0/chatline.c
trunk/client/gui-gtk-4.0/editgui.c
trunk/client/gui-gtk-4.0/gamedlgs.c
trunk/client/gui-gtk-4.0/gotodlg.c
trunk/client/gui-gtk-4.0/inputdlg.c
trunk/client/gui-gtk-4.0/optiondlg.c
trunk/client/gui-gtk-4.0/unitselect.c
Modified: trunk/client/gui-gtk-4.0/chatline.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-4.0/chatline.c?rev=35175&r1=35174&r2=35175&view=diff
==============================================================================
--- trunk/client/gui-gtk-4.0/chatline.c (original)
+++ trunk/client/gui-gtk-4.0/chatline.c Sat Apr 1 10:17:50 2017
@@ -1142,7 +1142,7 @@
chooser = gtk_color_chooser_widget_new();
gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
- chooser, FALSE, FALSE, 0);
+ chooser, FALSE, FALSE);
g_object_set_data(G_OBJECT(dialog), "chooser", chooser);
if (current_color) {
gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(chooser), current_color);
Modified: trunk/client/gui-gtk-4.0/editgui.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-4.0/editgui.c?rev=35175&r1=35174&r2=35175&view=diff
==============================================================================
--- trunk/client/gui-gtk-4.0/editgui.c (original)
+++ trunk/client/gui-gtk-4.0/editgui.c Sat Apr 1 10:17:50 2017
@@ -1064,7 +1064,7 @@
GTK_POLICY_AUTOMATIC);
gtk_scrolled_window_set_min_content_height(GTK_SCROLLED_WINDOW(scrollwin),
10 *
tileset_tile_height(tileset));
- gtk_box_pack_start(GTK_BOX(vbox), scrollwin, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(vbox), scrollwin, TRUE, TRUE);
view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(tvs->store));
gtk_widget_set_size_request(view, -1, 10 * tileset_tile_height(tileset));
Modified: trunk/client/gui-gtk-4.0/gamedlgs.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-4.0/gamedlgs.c?rev=35175&r1=35174&r2=35175&view=diff
==============================================================================
--- trunk/client/gui-gtk-4.0/gamedlgs.c (original)
+++ trunk/client/gui-gtk-4.0/gamedlgs.c Sat Apr 1 10:17:50 2017
@@ -334,7 +334,7 @@
if (can_client_issue_orders()) {
label = gtk_label_new(_("Changes will not take effect until next turn."));
- gtk_box_pack_start( GTK_BOX( content ), label, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(content), label, FALSE, FALSE);
}
multipliers_iterate(pmul) {
@@ -355,8 +355,8 @@
g_signal_connect(multipliers_scale[multiplier], "destroy",
G_CALLBACK(gtk_widget_destroyed),
&multipliers_scale[multiplier]);
- gtk_box_pack_start( GTK_BOX( content ), label, TRUE, TRUE, 5 );
- gtk_box_pack_start( GTK_BOX( content ), scale, TRUE, TRUE, 5 );
+ gtk_box_pack_start(GTK_BOX(content), label, TRUE, TRUE);
+ gtk_box_pack_start(GTK_BOX(content), scale, TRUE, TRUE);
gtk_widget_set_sensitive(multipliers_scale[multiplier],
can_client_issue_orders());
} multipliers_iterate_end;
@@ -417,10 +417,10 @@
content = gtk_dialog_get_content_area(GTK_DIALOG(shell));
rates_gov_label = gtk_label_new("");
- gtk_box_pack_start( GTK_BOX( content ), rates_gov_label, TRUE, TRUE, 5 );
+ gtk_box_pack_start(GTK_BOX(content), rates_gov_label, TRUE, TRUE);
frame = gtk_frame_new( _("Tax") );
- gtk_box_pack_start( GTK_BOX( content ), frame, TRUE, TRUE, 5 );
+ gtk_box_pack_start(GTK_BOX(content), frame, TRUE, TRUE);
hgrid = gtk_grid_new();
gtk_grid_set_column_spacing(GTK_GRID(hgrid), 10);
@@ -445,7 +445,7 @@
gtk_container_add(GTK_CONTAINER(hgrid), rates_tax_toggle);
frame = gtk_frame_new( _("Luxury") );
- gtk_box_pack_start( GTK_BOX( content ), frame, TRUE, TRUE, 5 );
+ gtk_box_pack_start(GTK_BOX(content), frame, TRUE, TRUE);
hgrid = gtk_grid_new();
gtk_grid_set_column_spacing(GTK_GRID(hgrid), 10);
@@ -470,7 +470,7 @@
gtk_container_add(GTK_CONTAINER(hgrid), rates_lux_toggle);
frame = gtk_frame_new( _("Science") );
- gtk_box_pack_start( GTK_BOX( content ), frame, TRUE, TRUE, 5 );
+ gtk_box_pack_start(GTK_BOX(content), frame, TRUE, TRUE);
hgrid = gtk_grid_new();
gtk_grid_set_column_spacing(GTK_GRID(hgrid), 10);
Modified: trunk/client/gui-gtk-4.0/gotodlg.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-4.0/gotodlg.c?rev=35175&r1=35174&r2=35175&view=diff
==============================================================================
--- trunk/client/gui-gtk-4.0/gotodlg.c (original)
+++ trunk/client/gui-gtk-4.0/gotodlg.c Sat Apr 1 10:17:50 2017
@@ -160,7 +160,7 @@
gtk_label_set_line_wrap(GTK_LABEL(source), TRUE);
gtk_label_set_justify(GTK_LABEL(source), GTK_JUSTIFY_CENTER);
gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dshell))),
- source, FALSE, FALSE, 0);
+ source, FALSE, FALSE);
label = g_object_new(GTK_TYPE_LABEL,
"use-underline", TRUE,
@@ -171,7 +171,7 @@
frame = gtk_frame_new("");
gtk_frame_set_label_widget(GTK_FRAME(frame), label);
gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dshell))),
- frame, TRUE, TRUE, 0);
+ frame, TRUE, TRUE);
vbox = gtk_grid_new();
gtk_orientable_set_orientation(GTK_ORIENTABLE(vbox),
Modified: trunk/client/gui-gtk-4.0/inputdlg.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-4.0/inputdlg.c?rev=35175&r1=35174&r2=35175&view=diff
==============================================================================
--- trunk/client/gui-gtk-4.0/inputdlg.c (original)
+++ trunk/client/gui-gtk-4.0/inputdlg.c Sat Apr 1 10:17:50 2017
@@ -80,7 +80,8 @@
label = gtk_frame_new(text);
/* Should use gtk_dialog_get_content_area() instead of ->vbox, but that
* requires at least gtk+-2.14.0 */
- gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(shell))),
label, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(shell))),
+ label, TRUE, TRUE);
input = gtk_entry_new();
gtk_container_add(GTK_CONTAINER(label), input);
Modified: trunk/client/gui-gtk-4.0/optiondlg.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-4.0/optiondlg.c?rev=35175&r1=35174&r2=35175&view=diff
==============================================================================
--- trunk/client/gui-gtk-4.0/optiondlg.c (original)
+++ trunk/client/gui-gtk-4.0/optiondlg.c Sat Apr 1 10:17:50 2017
@@ -335,7 +335,7 @@
chooser = gtk_color_chooser_widget_new();
g_object_set_data(G_OBJECT(dialog), "chooser", chooser);
gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
chooser,
- FALSE, FALSE, 0);
+ FALSE, FALSE);
if (current_color) {
gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(chooser), current_color);
}
@@ -384,7 +384,7 @@
G_CALLBACK(option_dialog_destroy_callback), pdialog);
gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(pdialog->shell))),
- pdialog->notebook, TRUE, TRUE, 0);
+ pdialog->notebook, TRUE, TRUE);
/* Add the options. */
options_iterate(poptset, poption) {
Modified: trunk/client/gui-gtk-4.0/unitselect.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-4.0/unitselect.c?rev=35175&r1=35174&r2=35175&view=diff
==============================================================================
--- trunk/client/gui-gtk-4.0/unitselect.c (original)
+++ trunk/client/gui-gtk-4.0/unitselect.c Sat Apr 1 10:17:50 2017
@@ -265,7 +265,7 @@
pdialog->notebook = gtk_notebook_new();
gtk_notebook_set_tab_pos(GTK_NOTEBOOK(pdialog->notebook),
GTK_POS_BOTTOM);
- gtk_box_pack_start(GTK_BOX(vbox), pdialog->notebook, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(vbox), pdialog->notebook, TRUE, TRUE);
/* Append pages. */
usdlg_tab_select(pdialog, _("_Units"), SELLOC_UNITS);
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
