From c72562245ac826d14449381e9871d6d537160952 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Mon, 18 Jul 2022 05:39:00 +0300 Subject: [PATCH 52/52] gtk4: Update attempts to set "margin" property for widgets There's no single "margin" property in gtk4, but it needs to be set separately for each direction. See osdn #45132 Signed-off-by: Marko Lindqvist --- client/gui-gtk-4.0/chatline.c | 10 ++++++-- client/gui-gtk-4.0/citydlg.c | 15 ++++++++--- client/gui-gtk-4.0/cma_fe.c | 10 ++++++-- client/gui-gtk-4.0/dialogs.c | 10 ++++++-- client/gui-gtk-4.0/diplodlg.c | 10 ++++++-- client/gui-gtk-4.0/finddlg.c | 5 +++- client/gui-gtk-4.0/gui_main.c | 27 ++++++++++++++++---- client/gui-gtk-4.0/happiness.c | 5 +++- client/gui-gtk-4.0/helpdlg.c | 5 +++- client/gui-gtk-4.0/inteldlg.c | 20 ++++++++++++--- client/gui-gtk-4.0/luaconsole.c | 5 +++- client/gui-gtk-4.0/messagedlg.c | 5 +++- client/gui-gtk-4.0/optiondlg.c | 10 ++++++-- client/gui-gtk-4.0/pages.c | 45 ++++++++++++++++++++++++++------- 14 files changed, 146 insertions(+), 36 deletions(-) diff --git a/client/gui-gtk-4.0/chatline.c b/client/gui-gtk-4.0/chatline.c index 110b7fadba..9d2d6a9e32 100644 --- a/client/gui-gtk-4.0/chatline.c +++ b/client/gui-gtk-4.0/chatline.c @@ -1342,7 +1342,10 @@ void chatline_init(void) G_CALLBACK(set_toolbar_visibility), &toolkit); entry = gtk_entry_new(); - g_object_set(entry, "margin", 2, NULL); + gtk_widget_set_margin_bottom(entry, 2); + gtk_widget_set_margin_end(entry, 2); + gtk_widget_set_margin_start(entry, 2); + gtk_widget_set_margin_top(entry, 2); gtk_widget_set_hexpand(entry, TRUE); toolkit.entry = entry; @@ -1458,7 +1461,10 @@ void chatline_init(void) /* Toggle button. */ button = gtk_toggle_button_new(); - g_object_set(button, "margin", 2, NULL); + gtk_widget_set_margin_bottom(button, 2); + gtk_widget_set_margin_end(button, 2); + gtk_widget_set_margin_start(button, 2); + gtk_widget_set_margin_top(button, 2); gtk_grid_attach(GTK_GRID(hgrid), button, grid_col++, 0, 1, 1); gtk_button_set_icon_name(GTK_BUTTON(button), "gtk-edit"); g_signal_connect(button, "toggled", G_CALLBACK(button_toggled), &toolkit); diff --git a/client/gui-gtk-4.0/citydlg.c b/client/gui-gtk-4.0/citydlg.c index 8ab878debf..4b9704af64 100644 --- a/client/gui-gtk-4.0/citydlg.c +++ b/client/gui-gtk-4.0/citydlg.c @@ -752,7 +752,10 @@ static GtkWidget *create_city_info_table(struct city_dialog *pdialog, GtkEventController *controller; table = gtk_grid_new(); - g_object_set(table, "margin", 4, NULL); + gtk_widget_set_margin_bottom(table, 4); + gtk_widget_set_margin_end(table, 4); + gtk_widget_set_margin_start(table, 4); + gtk_widget_set_margin_top(table, 4); intl_slist(ARRAY_SIZE(output_label), output_label, &output_label_done); @@ -1192,7 +1195,10 @@ static int create_production_header(struct city_dialog *pdialog, int grid_col = 0; hgrid = gtk_grid_new(); - g_object_set(hgrid, "margin", 2, NULL); + gtk_widget_set_margin_bottom(hgrid, 2); + gtk_widget_set_margin_end(hgrid, 2); + gtk_widget_set_margin_start(hgrid, 2); + gtk_widget_set_margin_top(hgrid, 2); gtk_grid_set_column_spacing(GTK_GRID(hgrid), 10); gtk_grid_attach(GTK_GRID(grid), hgrid, 0, row++, 1, 1); @@ -1294,7 +1300,10 @@ static void create_and_append_worklist_page(struct city_dialog *pdialog) } editor = create_worklist(); - g_object_set(editor, "margin", 6, NULL); + gtk_widget_set_margin_bottom(editor, 6); + gtk_widget_set_margin_end(editor, 6); + gtk_widget_set_margin_start(editor, 6); + gtk_widget_set_margin_top(editor, 6); reset_city_worklist(editor, pdialog->pcity); gtk_grid_attach(GTK_GRID(page), editor, 0, page_row++, 1, 1); pdialog->production.worklist = editor; diff --git a/client/gui-gtk-4.0/cma_fe.c b/client/gui-gtk-4.0/cma_fe.c index a475186a6b..731717edd7 100644 --- a/client/gui-gtk-4.0/cma_fe.c +++ b/client/gui-gtk-4.0/cma_fe.c @@ -325,7 +325,10 @@ struct cma_dialog *create_cma_dialog(struct city *pcity, bool tiny) vgrid = gtk_grid_new(); grid_row = 0; - g_object_set(vgrid, "margin", 2, NULL); + gtk_widget_set_margin_bottom(vgrid, 2); + gtk_widget_set_margin_end(vgrid, 2); + gtk_widget_set_margin_start(vgrid, 2); + gtk_widget_set_margin_top(vgrid, 2); gtk_orientable_set_orientation(GTK_ORIENTABLE(vgrid), GTK_ORIENTATION_VERTICAL); gtk_grid_attach(GTK_GRID(page), vgrid, 0, page_row++, 1, 1); @@ -349,7 +352,10 @@ struct cma_dialog *create_cma_dialog(struct city *pcity, bool tiny) /* Minimal Surplus and Factor */ table = gtk_grid_new(); - g_object_set(table, "margin", 2, NULL); + gtk_widget_set_margin_bottom(table, 2); + gtk_widget_set_margin_end(table, 2); + gtk_widget_set_margin_start(table, 2); + gtk_widget_set_margin_top(table, 2); gtk_grid_attach(GTK_GRID(vgrid), table, 0, grid_row++, 1, 1); label = gtk_label_new(_("Minimal Surplus")); diff --git a/client/gui-gtk-4.0/dialogs.c b/client/gui-gtk-4.0/dialogs.c index 1aff1f3d8e..4d45405b02 100644 --- a/client/gui-gtk-4.0/dialogs.c +++ b/client/gui-gtk-4.0/dialogs.c @@ -1063,7 +1063,10 @@ static void create_races_dialog(struct player *pplayer) races_properties = table = gtk_grid_new(); g_signal_connect(table, "destroy", G_CALLBACK(widget_destroyed), &races_properties); - g_object_set(table, "margin", 6, NULL); + gtk_widget_set_margin_bottom(table, 6); + gtk_widget_set_margin_end(table, 6); + gtk_widget_set_margin_start(table, 6); + gtk_widget_set_margin_top(table, 6); gtk_grid_set_row_spacing(GTK_GRID(table), 2); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), table, label); @@ -1168,7 +1171,10 @@ static void create_races_dialog(struct player *pplayer) label = gtk_label_new_with_mnemonic(_("_Description")); text = gtk_text_view_new(); - g_object_set(text, "margin", 6, NULL); + gtk_widget_set_margin_bottom(text, 6); + gtk_widget_set_margin_end(text, 6); + gtk_widget_set_margin_start(text, 6); + gtk_widget_set_margin_top(text, 6); gtk_widget_set_hexpand(text, TRUE); gtk_widget_set_vexpand(text, TRUE); races_text = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)); diff --git a/client/gui-gtk-4.0/diplodlg.c b/client/gui-gtk-4.0/diplodlg.c index 7416c3a538..e7e08ad9e5 100644 --- a/client/gui-gtk-4.0/diplodlg.c +++ b/client/gui-gtk-4.0/diplodlg.c @@ -548,7 +548,10 @@ static struct Diplomacy_notebook *diplomacy_main_create(void) gtk_notebook_set_scrollable(GTK_NOTEBOOK(dipl_main->notebook), TRUE); dipl_sw = gtk_scrolled_window_new(); - g_object_set(dipl_sw, "margin", 2, NULL); + gtk_widget_set_margin_bottom(dipl_sw, 2); + gtk_widget_set_margin_end(dipl_sw, 2); + gtk_widget_set_margin_start(dipl_sw, 2); + gtk_widget_set_margin_top(dipl_sw, 2); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(dipl_sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); @@ -942,7 +945,10 @@ static struct Diplomacy_dialog *create_diplomacy_dialog(struct Treaty *ptreaty, rend, "text", 0, NULL); sw = gtk_scrolled_window_new(); - g_object_set(sw, "margin", 2, NULL); + gtk_widget_set_margin_bottom(sw, 2); + gtk_widget_set_margin_end(sw, 2); + gtk_widget_set_margin_start(sw, 2); + gtk_widget_set_margin_top(sw, 2); gtk_scrolled_window_set_has_frame(GTK_SCROLLED_WINDOW(sw), TRUE); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); diff --git a/client/gui-gtk-4.0/finddlg.c b/client/gui-gtk-4.0/finddlg.c index e6dc43d022..6d09f485f8 100644 --- a/client/gui-gtk-4.0/finddlg.c +++ b/client/gui-gtk-4.0/finddlg.c @@ -99,7 +99,10 @@ void popup_find_dialog(void) gtk_tree_view_append_column(GTK_TREE_VIEW(find_view), column); sw = gtk_scrolled_window_new(); - g_object_set(sw, "margin", 2, NULL); + gtk_widget_set_margin_bottom(sw, 2); + gtk_widget_set_margin_end(sw, 2); + gtk_widget_set_margin_start(sw, 2); + gtk_widget_set_margin_top(sw, 2); gtk_scrolled_window_set_has_frame(GTK_SCROLLED_WINDOW(sw), TRUE); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); diff --git a/client/gui-gtk-4.0/gui_main.c b/client/gui-gtk-4.0/gui_main.c index 2d7d69cfbe..6366fc3e4d 100644 --- a/client/gui-gtk-4.0/gui_main.c +++ b/client/gui-gtk-4.0/gui_main.c @@ -1133,6 +1133,7 @@ static void setup_widgets(void) int grid2_col = 0; GtkGesture *mc_gesture; GtkEventController *mc_controller; + GtkWidget *ebar; message_buffer = gtk_text_buffer_new(NULL); @@ -1168,7 +1169,10 @@ static void setup_widgets(void) editgui_create_widgets(); ingame_votebar = voteinfo_bar_new(FALSE); - g_object_set(ingame_votebar, "margin", 2, NULL); + gtk_widget_set_margin_bottom(ingame_votebar, 2); + gtk_widget_set_margin_end(ingame_votebar, 2); + gtk_widget_set_margin_start(ingame_votebar, 2); + gtk_widget_set_margin_top(ingame_votebar, 2); /* *** everything in the top *** */ @@ -1447,7 +1451,10 @@ static void setup_widgets(void) gtk_box_append(GTK_BOX(unit_info_box), hgrid2); table = gtk_grid_new(); - g_object_set(table, "margin", 5, NULL); + gtk_widget_set_margin_bottom(table, 5); + gtk_widget_set_margin_end(table, 5); + gtk_widget_set_margin_start(table, 5); + gtk_widget_set_margin_top(table, 5); gtk_grid_attach(GTK_GRID(hgrid2), table, grid2_col++, 0, 1, 1); gtk_grid_set_row_spacing(GTK_GRID(table), 2); @@ -1489,7 +1496,11 @@ static void setup_widgets(void) gtk_grid_attach(GTK_GRID(vgrid), editgui_get_editbar()->widget, 0, grid_row++, 1, 1); - g_object_set(editgui_get_editbar()->widget, "margin", 4, NULL); + ebar = editgui_get_editbar()->widget; + gtk_widget_set_margin_bottom(ebar, 4); + gtk_widget_set_margin_end(ebar, 4); + gtk_widget_set_margin_start(ebar, 4); + gtk_widget_set_margin_top(ebar, 4); label = gtk_label_new(Q_("?noun:View")); gtk_notebook_append_page(GTK_NOTEBOOK(top_notebook), vgrid, label); @@ -1591,7 +1602,10 @@ static void setup_widgets(void) hpaned = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL); } gtk_grid_attach(GTK_GRID(vgrid), hpaned, 0, grid_row++, 1, 1); - g_object_set(hpaned, "margin", 4, NULL); + gtk_widget_set_margin_bottom(hpaned, 4); + gtk_widget_set_margin_end(hpaned, 4); + gtk_widget_set_margin_start(hpaned, 4); + gtk_widget_set_margin_top(hpaned, 4); bottom_hpaned = hpaned; bottom_notebook = gtk_notebook_new(); @@ -1651,7 +1665,10 @@ static void setup_widgets(void) /* the chat line */ view = inputline_toolkit_view_new(); gtk_grid_attach(GTK_GRID(vgrid), view, 0, grid_row++, 1, 1); - g_object_set(view, "margin", 3, NULL); + gtk_widget_set_margin_bottom(view, 3); + gtk_widget_set_margin_end(view, 3); + gtk_widget_set_margin_start(view, 3); + gtk_widget_set_margin_top(view, 3); button = gtk_check_button_new_with_label(_("Allies Only")); gtk_widget_set_focus_on_click(button, FALSE); diff --git a/client/gui-gtk-4.0/happiness.c b/client/gui-gtk-4.0/happiness.c index 08d1678bd8..afa2165049 100644 --- a/client/gui-gtk-4.0/happiness.c +++ b/client/gui-gtk-4.0/happiness.c @@ -205,7 +205,10 @@ static struct happiness_dialog *create_happiness_dialog(struct city *pcity, gtk_grid_attach(GTK_GRID(pdialog->shell), pdialog->cityname_label, 0, 0, 1, 1); table = gtk_grid_new(); - g_object_set(table, "margin", 4, NULL); + gtk_widget_set_margin_bottom(table, 4); + gtk_widget_set_margin_end(table, 4); + gtk_widget_set_margin_start(table, 4); + gtk_widget_set_margin_top(table, 4); gtk_grid_set_row_spacing(GTK_GRID(table), 10); intl_slist(ARRAY_SIZE(happiness_label_str), happiness_label_str, diff --git a/client/gui-gtk-4.0/helpdlg.c b/client/gui-gtk-4.0/helpdlg.c index 7a698eb6ad..8568c3937b 100644 --- a/client/gui-gtk-4.0/helpdlg.c +++ b/client/gui-gtk-4.0/helpdlg.c @@ -1044,7 +1044,10 @@ static void help_update_tech(const struct help_item *pitem, char *title) } w = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL); - g_object_set(w, "margin", 5, NULL); + gtk_widget_set_margin_bottom(w, 5); + gtk_widget_set_margin_end(w, 5); + gtk_widget_set_margin_start(w, 5); + gtk_widget_set_margin_top(w, 5); gtk_widget_set_hexpand(w, TRUE); gtk_widget_set_vexpand(w, TRUE); help_box_add(w); diff --git a/client/gui-gtk-4.0/inteldlg.c b/client/gui-gtk-4.0/inteldlg.c index 0e8b0601e5..3d9693ce2f 100644 --- a/client/gui-gtk-4.0/inteldlg.c +++ b/client/gui-gtk-4.0/inteldlg.c @@ -274,7 +274,10 @@ static struct intel_dialog *create_intel_dialog(struct player *p) /* overview tab. */ table = gtk_grid_new(); - g_object_set(table, "margin", 6, NULL); + gtk_widget_set_margin_bottom(table, 6); + gtk_widget_set_margin_end(table, 6); + gtk_widget_set_margin_start(table, 6); + gtk_widget_set_margin_top(table, 6); gtk_grid_set_row_spacing(GTK_GRID(table), 2); gtk_grid_set_column_spacing(GTK_GRID(table), 12); @@ -304,7 +307,10 @@ static struct intel_dialog *create_intel_dialog(struct player *p) pdialog->diplstates = gtk_tree_store_new(1, G_TYPE_STRING); view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(pdialog->diplstates)); - g_object_set(view, "margin", 6, NULL); + gtk_widget_set_margin_bottom(view, 6); + gtk_widget_set_margin_end(view, 6); + gtk_widget_set_margin_start(view, 6); + gtk_widget_set_margin_top(view, 6); gtk_widget_set_hexpand(view, TRUE); gtk_widget_set_vexpand(view, TRUE); g_object_unref(pdialog->diplstates); @@ -337,7 +343,10 @@ static struct intel_dialog *create_intel_dialog(struct player *p) 1, GTK_SORT_ASCENDING); view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(pdialog->techs)); - g_object_set(view, "margin", 6, NULL); + gtk_widget_set_margin_bottom(view, 6); + gtk_widget_set_margin_end(view, 6); + gtk_widget_set_margin_start(view, 6); + gtk_widget_set_margin_top(view, 6); gtk_widget_set_hexpand(view, TRUE); gtk_widget_set_vexpand(view, TRUE); g_object_unref(pdialog->techs); @@ -417,7 +426,10 @@ static struct intel_wonder_dialog *create_intel_wonder_dialog(struct player *p) gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(pdialog->wonders), 3, GTK_SORT_DESCENDING); view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(pdialog->wonders)); - g_object_set(view, "margin", 6, NULL); + gtk_widget_set_margin_bottom(view, 6); + gtk_widget_set_margin_end(view, 6); + gtk_widget_set_margin_start(view, 6); + gtk_widget_set_margin_top(view, 6); gtk_widget_set_hexpand(view, TRUE); gtk_widget_set_vexpand(view, TRUE); g_object_unref(pdialog->wonders); diff --git a/client/gui-gtk-4.0/luaconsole.c b/client/gui-gtk-4.0/luaconsole.c index ef0306c8a5..120c4442a4 100644 --- a/client/gui-gtk-4.0/luaconsole.c +++ b/client/gui-gtk-4.0/luaconsole.c @@ -225,7 +225,10 @@ static void luaconsole_dialog_create(struct luaconsole_data *pdialog) /* The lua console input line. */ entry = gtk_entry_new(); - g_object_set(entry, "margin", 2, NULL); + gtk_widget_set_margin_bottom(entry, 2); + gtk_widget_set_margin_end(entry, 2); + gtk_widget_set_margin_start(entry, 2); + gtk_widget_set_margin_top(entry, 2); gtk_grid_attach(GTK_GRID(vgrid), entry, 0, grid_row++, 1, 1); g_signal_connect(entry, "activate", G_CALLBACK(luaconsole_input_return), NULL); diff --git a/client/gui-gtk-4.0/messagedlg.c b/client/gui-gtk-4.0/messagedlg.c index 958ea9637d..e17ba2fb02 100644 --- a/client/gui-gtk-4.0/messagedlg.c +++ b/client/gui-gtk-4.0/messagedlg.c @@ -75,7 +75,10 @@ static void create_messageopt_dialog(void) gui_dialog_add_button(shell, NULL, _("_Cancel"), GTK_RESPONSE_CANCEL); explanation = gtk_label_new(NULL); - g_object_set(explanation, "margin", 4, NULL); + gtk_widget_set_margin_bottom(explanation, 4); + gtk_widget_set_margin_end(explanation, 4); + gtk_widget_set_margin_start(explanation, 4); + gtk_widget_set_margin_top(explanation, 4); gtk_label_set_markup(GTK_LABEL(explanation), _("Where to display messages?\n" "Output window ; " diff --git a/client/gui-gtk-4.0/optiondlg.c b/client/gui-gtk-4.0/optiondlg.c index 25e8ca9e17..72758beaf5 100644 --- a/client/gui-gtk-4.0/optiondlg.c +++ b/client/gui-gtk-4.0/optiondlg.c @@ -512,7 +512,10 @@ static void option_dialog_option_add(struct option_dialog *pdialog, } pdialog->vboxes[category] = gtk_box_new(GTK_ORIENTATION_VERTICAL, 2); - g_object_set(pdialog->vboxes[category], "margin", 8, NULL); + gtk_widget_set_margin_bottom(pdialog->vboxes[category], 8); + gtk_widget_set_margin_end(pdialog->vboxes[category], 8); + gtk_widget_set_margin_start(pdialog->vboxes[category], 8); + gtk_widget_set_margin_top(pdialog->vboxes[category], 8); gtk_widget_set_hexpand(pdialog->vboxes[category], TRUE); gtk_scrolled_window_set_child(GTK_SCROLLED_WINDOW(sw), pdialog->vboxes[category]); @@ -522,7 +525,10 @@ static void option_dialog_option_add(struct option_dialog *pdialog, main_hbox = gtk_grid_new(); label = gtk_label_new(option_description(poption)); - g_object_set(label, "margin", 2, NULL); + gtk_widget_set_margin_bottom(label, 2); + gtk_widget_set_margin_end(label, 2); + gtk_widget_set_margin_start(label, 2); + gtk_widget_set_margin_top(label, 2); gtk_grid_attach(GTK_GRID(main_hbox), label, main_col++, 0, 1, 1); gtk_widget_set_tooltip_text(main_hbox, option_help_text(poption)); g_signal_connect(main_hbox, "button_press_event", diff --git a/client/gui-gtk-4.0/pages.c b/client/gui-gtk-4.0/pages.c index 70bbd9a7f5..87e3987044 100644 --- a/client/gui-gtk-4.0/pages.c +++ b/client/gui-gtk-4.0/pages.c @@ -240,7 +240,10 @@ GtkWidget *create_main_page(void) widget = vgrid; frame = gtk_frame_new(NULL); - g_object_set(frame, "margin", 18, NULL); + gtk_widget_set_margin_bottom(frame, 18); + gtk_widget_set_margin_end(frame, 18); + gtk_widget_set_margin_start(frame, 18); + gtk_widget_set_margin_top(frame, 18); gtk_widget_set_halign(frame, GTK_ALIGN_CENTER); gtk_grid_attach(GTK_GRID(vgrid), frame, 0, grid_row++, 1, 1); @@ -297,7 +300,10 @@ GtkWidget *create_main_page(void) #endif /* IS_BETA_VERSION || IS_DEVEL_VERSION */ table = gtk_grid_new(); - g_object_set(table, "margin", 12, NULL); + gtk_widget_set_margin_bottom(table, 12); + gtk_widget_set_margin_end(table, 12); + gtk_widget_set_margin_start(table, 12); + gtk_widget_set_margin_top(table, 12); gtk_widget_set_hexpand(table, TRUE); gtk_widget_set_vexpand(table, TRUE); gtk_widget_set_halign(table, GTK_ALIGN_CENTER); @@ -652,7 +658,10 @@ static GtkWidget *save_dialog_new(const char *title, const char *savelabel, sbox = gtk_grid_new(); grids_row = 0; - g_object_set(sbox, "margin", 12, NULL); + gtk_widget_set_margin_bottom(sbox, 12); + gtk_widget_set_margin_end(sbox, 12); + gtk_widget_set_margin_start(sbox, 12); + gtk_widget_set_margin_top(sbox, 12); gtk_orientable_set_orientation(GTK_ORIENTABLE(sbox), GTK_ORIENTATION_VERTICAL); gtk_grid_set_row_spacing(GTK_GRID(sbox), 2); @@ -1316,7 +1325,10 @@ GtkWidget *create_network_page(void) hgrid = gtk_grid_new(); gtk_grid_set_column_spacing(GTK_GRID(hgrid), 12); - g_object_set(hgrid, "margin", 8, NULL); + gtk_widget_set_margin_bottom(hgrid, 8); + gtk_widget_set_margin_end(hgrid, 8); + gtk_widget_set_margin_start(hgrid, 8); + gtk_widget_set_margin_top(hgrid, 8); gtk_grid_attach(GTK_GRID(sbox), hgrid, 0, sbox_row++, 1, 1); table = gtk_grid_new(); @@ -1426,7 +1438,10 @@ GtkWidget *create_network_page(void) gtk_grid_attach(GTK_GRID(hgrid), sw, grid_col++, 0, 1, 1); bbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2); - g_object_set(bbox, "margin", 2, NULL); + gtk_widget_set_margin_bottom(bbox, 2); + gtk_widget_set_margin_end(bbox, 2); + gtk_widget_set_margin_start(bbox, 2); + gtk_widget_set_margin_top(bbox, 2); gtk_box_set_spacing(GTK_BOX(bbox), 12); gtk_grid_attach(GTK_GRID(sbox), bbox, 0, sbox_row++, 1, 1); @@ -2660,7 +2675,10 @@ GtkWidget *create_start_page(void) gtk_grid_attach(GTK_GRID(box), sbox, 0, box_row++, 1, 1); vgrid = gtk_grid_new(); - g_object_set(vgrid, "margin", 12, NULL); + gtk_widget_set_margin_bottom(vgrid, 12); + gtk_widget_set_margin_end(vgrid, 12); + gtk_widget_set_margin_start(vgrid, 12); + gtk_widget_set_margin_top(vgrid, 12); gtk_orientable_set_orientation(GTK_ORIENTABLE(vgrid), GTK_ORIENTATION_VERTICAL); gtk_grid_set_row_spacing(GTK_GRID(vgrid), 2); @@ -2744,7 +2762,10 @@ GtkWidget *create_start_page(void) button = icon_label_button_new("preferences-system", _("_More Game Options...")); - g_object_set(button, "margin", 8, NULL); + gtk_widget_set_margin_bottom(button, 8); + gtk_widget_set_margin_end(button, 8); + gtk_widget_set_margin_start(button, 8); + gtk_widget_set_margin_top(button, 8); gtk_widget_set_halign(button, GTK_ALIGN_CENTER); gtk_widget_set_valign(button, GTK_ALIGN_CENTER); g_signal_connect(button, "clicked", @@ -3304,7 +3325,10 @@ GtkWidget *create_scenario_page(void) filenamebox = gtk_grid_new(); gtk_grid_set_column_spacing(GTK_GRID(hbox), 12); - g_object_set(filenamebox, "margin", 5, NULL); + gtk_widget_set_margin_bottom(filenamebox, 5); + gtk_widget_set_margin_end(filenamebox, 5); + gtk_widget_set_margin_start(filenamebox, 5); + gtk_widget_set_margin_top(filenamebox, 5); gtk_grid_attach(GTK_GRID(filenamebox), text, filenamecol++, 0, 1, 1); gtk_grid_attach(GTK_GRID(filenamebox), scenario_filename, @@ -3319,7 +3343,10 @@ GtkWidget *create_scenario_page(void) versionbox = gtk_grid_new(); gtk_grid_set_column_spacing(GTK_GRID(hbox), 12); - g_object_set(versionbox, "margin", 5, NULL); + gtk_widget_set_margin_bottom(versionbox, 5); + gtk_widget_set_margin_end(versionbox, 5); + gtk_widget_set_margin_start(versionbox, 5); + gtk_widget_set_margin_top(versionbox, 5); gtk_grid_attach(GTK_GRID(versionbox), vertext, vercol++, 0, 1, 1); gtk_grid_attach(GTK_GRID(versionbox), scenario_version, -- 2.35.1