From 7c454bcd466f49b7c26ce689189361e5d1bedb0b Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 9 Sep 2022 21:27:03 +0300 Subject: [PATCH 42/42] gtk4: Don't try to treat GtkBox as GtkGrid See osdn #4558 Signed-off-by: Marko Lindqvist --- client/gui-gtk-4.0/helpdlg.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/client/gui-gtk-4.0/helpdlg.c b/client/gui-gtk-4.0/helpdlg.c index 23966c0d2a..c020e67140 100644 --- a/client/gui-gtk-4.0/helpdlg.c +++ b/client/gui-gtk-4.0/helpdlg.c @@ -463,14 +463,13 @@ static void create_help_dialog(void) GtkWidget *hgrid; GtkWidget *button; GtkWidget *text; - int i, j; + int i, j; GtkCellRenderer *rend; GtkTreeViewColumn *col; GArray *array; GtkTreeStore *store; GtkTreeSelection *selection; int grid_col = 0; - int buttons_col = 0; help_history = g_ptr_array_new(); help_history_pos = -1; @@ -753,8 +752,8 @@ static void create_help_dialog(void) G_CALLBACK(help_tech_tree_collapse_callback), help_tree); help_tree_buttons_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); - gtk_grid_attach(GTK_GRID(help_tree_buttons_hbox), help_tree_expand, buttons_col++, 0, 1, 1); - gtk_grid_attach(GTK_GRID(help_tree_buttons_hbox), help_tree_collapse, buttons_col++, 0, 1, 1); + gtk_box_append(GTK_BOX(help_tree_buttons_hbox), help_tree_expand); + gtk_box_append(GTK_BOX(help_tree_buttons_hbox), help_tree_collapse); gtk_box_append(GTK_BOX(help_box), help_tree_buttons_hbox); gtk_widget_show(help_tree_buttons_hbox); } -- 2.35.1