GTK4: gtk_hbox and gtk_vbox deprecated

GTK4 migration
- gtk_hbox_new() and gtk_vbox_new() replaced by gtk_box() and
GTK_ORIENTATION_HORIZONTAL or GTK_ORIENTATION_VERTICAL

diff --git a/src/bar_histogram.c b/src/bar_histogram.c
index 41d25db..71bdee9 100644 (file)
--- a/src/bar_histogram.c
+++ b/src/bar_histogram.c
@@ -281,7 +281,7 @@ static GtkWidget *bar_pane_histogram_new(const gchar *id, const gchar *title, gi
        histogram_set_channel(phd->histogram, histogram_channel);
        histogram_set_mode(phd->histogram, histogram_mode);
 
-       phd->widget = gtk_vbox_new(FALSE, PREF_PAD_GAP);
+       phd->widget = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP);
 
        g_object_set_data(G_OBJECT(phd->widget), "pane_data", phd);
        g_signal_connect(G_OBJECT(phd->widget), "destroy",

diff --git a/src/bar_sort.c b/src/bar_sort.c
index d912634..7866ee0 100644 (file)
--- a/src/bar_sort.c
+++ b/src/bar_sort.c
@@ -649,7 +649,7 @@ static GtkWidget *bar_sort_new(LayoutWindow *lw, SortActionType action,
        sd->undo_dest_list = NULL;
        sd->undo_collection = NULL;
 
-       sd->vbox = gtk_vbox_new(FALSE, PREF_PAD_GAP);
+       sd->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
        DEBUG_NAME(sd->vbox);
        g_object_set_data(G_OBJECT(sd->vbox), "bar_sort_data", sd);
        g_signal_connect(G_OBJECT(sd->vbox), "destroy",

diff --git a/src/fullscreen.c b/src/fullscreen.c
index b9ff3c0..412356a 100644 (file)
--- a/src/fullscreen.c
+++ b/src/fullscreen.c
@@ -657,7 +657,7 @@ GtkWidget *fullscreen_prefs_selection_new(const gchar *text, gint *screen_value,
 
        if (!screen_value) return NULL;
 
-       vbox = gtk_vbox_new(FALSE, PREF_PAD_GAP);
+       vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
        DEBUG_NAME(vbox);
        hbox = pref_box_new(vbox, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
        if (text) pref_label_new(hbox, text);

diff --git a/src/image.c b/src/image.c
index 73fc550..7e92555 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -2202,7 +2202,7 @@ ImageWindow *image_new(gboolean frame)
 
        image_options_set(imd);
 
-       imd->widget = gtk_vbox_new(0, 0);
+       imd->widget = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
        DEBUG_NAME(imd->widget);
 
        image_set_frame(imd, frame);

diff --git a/src/osd.c b/src/osd.c
index fb986b9..1742cfa 100644 (file)
--- a/src/osd.c
+++ b/src/osd.c
@@ -164,7 +164,7 @@ GtkWidget *osd_new(gint max_cols, GtkWidget *template_view)
        gdouble entries;
        GtkWidget *viewport;
 
-       vbox = gtk_vbox_new(FALSE, 0);
+       vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
 
        pref_label_new(vbox, _("To include predefined tags in the template, click a button or drag-and-drop"));
 

diff --git a/src/pan-view/pan-view-filter.c b/src/pan-view/pan-view-filter.c
index ad33c94..e0ad80e 100644 (file)
--- a/src/pan-view/pan-view-filter.c
+++ b/src/pan-view/pan-view-filter.c
@@ -67,14 +67,14 @@ PanViewFilterUi *pan_filter_ui_new(PanWindow *pw)
        }
 
        // Build the actual filter UI.
-       ui->filter_box = gtk_hbox_new(FALSE, PREF_PAD_SPACE);
+       ui->filter_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
        pref_spacer(ui->filter_box, 0);
        pref_label_new(ui->filter_box, _("Keyword Filter:"));
 
        gtk_box_pack_start(GTK_BOX(ui->filter_box), ui->filter_mode_combo, FALSE, FALSE, 0);
        gtk_widget_show(ui->filter_mode_combo);
 
-       hbox = gtk_hbox_new(TRUE, PREF_PAD_SPACE);
+       hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
        gtk_box_pack_start(GTK_BOX(ui->filter_box), hbox, TRUE, TRUE, 0);
        gtk_widget_show(hbox);
 
@@ -87,7 +87,7 @@ PanViewFilterUi *pan_filter_ui_new(PanWindow *pw)
        //gtk_box_pack_start(GTK_BOX(hbox), ui->filter_label, FALSE, FALSE, 0);
        //gtk_widget_show(ui->filter_label);
 
-       ui->filter_kw_hbox = gtk_hbox_new(FALSE, PREF_PAD_SPACE);
+       ui->filter_kw_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
        gtk_box_pack_start(GTK_BOX(hbox), ui->filter_kw_hbox, TRUE, TRUE, 0);
        gtk_widget_show(ui->filter_kw_hbox);
 
@@ -95,7 +95,7 @@ PanViewFilterUi *pan_filter_ui_new(PanWindow *pw)
        ui->filter_button = gtk_toggle_button_new();
        gtk_button_set_relief(GTK_BUTTON(ui->filter_button), GTK_RELIEF_NONE);
        gtk_button_set_focus_on_click(GTK_BUTTON(ui->filter_button), FALSE);
-       hbox = gtk_hbox_new(FALSE, PREF_PAD_GAP);
+       hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP);
        gtk_container_add(GTK_CONTAINER(ui->filter_button), hbox);
        gtk_widget_show(hbox);
        ui->filter_button_arrow = gtk_image_new_from_icon_name("pan-up", GTK_ICON_SIZE_BUTTON);

diff --git a/src/pan-view/pan-view.c b/src/pan-view/pan-view.c
index 537cf84..7205a25 100644 (file)
--- a/src/pan-view/pan-view.c
+++ b/src/pan-view/pan-view.c
@@ -1889,7 +1889,7 @@ static void pan_window_new_real(FileData *dir_fd)
        gtk_window_set_resizable(GTK_WINDOW(pw->window), TRUE);
        gtk_container_set_border_width(GTK_CONTAINER(pw->window), 0);
 
-       vbox = gtk_vbox_new(FALSE, 0);
+       vbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
        DEBUG_NAME(vbox);
        gtk_container_add(GTK_CONTAINER(pw->window), vbox);
        gtk_widget_show(vbox);
@@ -1995,7 +1995,7 @@ static void pan_window_new_real(FileData *dir_fd)
        gtk_box_pack_start(GTK_BOX(box), frame, TRUE, TRUE, 0);
        gtk_widget_show(frame);
 
-       hbox = gtk_hbox_new(FALSE, PREF_PAD_SPACE);
+       hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
        gtk_container_add(GTK_CONTAINER(frame), hbox);
        gtk_widget_show(hbox);
 

diff --git a/src/search_and_run.c b/src/search_and_run.c
index 226f7f4..9c98ee5 100644 (file)
--- a/src/search_and_run.c
+++ b/src/search_and_run.c
@@ -299,7 +299,7 @@ GtkWidget *search_and_run_new(LayoutWindow *lw)
 
        gtk_window_set_resizable(GTK_WINDOW(sar->window), TRUE);
 
-       sar->vbox = gtk_vbox_new(FALSE, PREF_PAD_GAP);
+       sar->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
        gtk_container_add(GTK_CONTAINER(sar->window), sar->vbox);
        gtk_widget_show(sar->vbox);
 

diff --git a/src/shortcuts.c b/src/shortcuts.c
index b74bf93..b23940b 100644 (file)
--- a/src/shortcuts.c
+++ b/src/shortcuts.c
@@ -145,7 +145,7 @@ static GtkWidget *shortcuts_new(LayoutWindow *lw)
 
        scd->lw = lw;
 
-       scd->vbox = gtk_vbox_new(FALSE, PREF_PAD_GAP);
+       scd->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
        g_object_set_data(G_OBJECT(scd->vbox), "shortcuts_data", scd);
        g_signal_connect(G_OBJECT(scd->vbox), "destroy",
                        G_CALLBACK(shortcuts_destroy), scd);

diff --git a/src/view_file/view_file.c b/src/view_file/view_file.c
index 5742ae5..3e8c1bd 100644 (file)
--- a/src/view_file/view_file.c
+++ b/src/view_file/view_file.c
@@ -1222,7 +1222,7 @@ static GtkWidget *vf_file_filter_init(ViewFile *vf)
        gtk_box_pack_start(GTK_BOX(hbox), menubar, FALSE, TRUE, 0);
        gtk_widget_show(menubar);
 
-       box = gtk_hbox_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP);
+       box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP);
        icon = gtk_image_new_from_icon_name("pan-down", GTK_ICON_SIZE_MENU);
        label = gtk_label_new(_("Class"));