GTK4: gtk_toolbar_new()

GTK4 migration

- gtk_toolbar_new() deleted Replaced by gtk_box_new()

diff --git a/src/bar-sort.cc b/src/bar-sort.cc
index 7c58f3c..3559846 100644 (file)
--- a/src/bar-sort.cc
+++ b/src/bar-sort.cc
@@ -740,7 +740,7 @@ static GtkWidget *bar_sort_new(LayoutWindow *lw, SortActionType action,
        gq_gtk_box_pack_start(GTK_BOX(sd->vbox), sd->bookmarks, TRUE, TRUE, 0);
        gtk_widget_show(sd->bookmarks);
 
-       tbar = pref_toolbar_new(sd->vbox, GTK_TOOLBAR_ICONS);
+       tbar = pref_toolbar_new(sd->vbox);
        DEBUG_NAME(tbar);
 
        sd->add_button = pref_toolbar_button(tbar, GQ_ICON_ADD, _("Add"), FALSE,

diff --git a/src/bar.cc b/src/bar.cc
index 2dba35d..c97a9d8 100644 (file)
--- a/src/bar.cc
+++ b/src/bar.cc
@@ -795,7 +795,7 @@ GtkWidget *bar_new(LayoutWindow *lw)
        add_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
        DEBUG_NAME(add_box);
        gq_gtk_box_pack_end(GTK_BOX(bd->widget), add_box, FALSE, FALSE, 0);
-       tbar = pref_toolbar_new(add_box, GTK_TOOLBAR_ICONS);
+       tbar = pref_toolbar_new(add_box);
        bd->add_button = pref_toolbar_button(tbar, GQ_ICON_ADD, _("Add"), FALSE,
                                             _("Add Pane"), G_CALLBACK(bar_menu_add_cb), bd);
        gtk_widget_show(add_box);

diff --git a/src/shortcuts.cc b/src/shortcuts.cc
index f43dcea..8bc12ea 100644 (file)
--- a/src/shortcuts.cc
+++ b/src/shortcuts.cc
@@ -153,7 +153,7 @@ static GtkWidget *shortcuts_new(LayoutWindow *lw)
        gq_gtk_box_pack_start(GTK_BOX(scd->vbox), scd->bookmarks, TRUE, TRUE, 0);
        gtk_widget_show(scd->bookmarks);
 
-       tbar = pref_toolbar_new(scd->vbox, GTK_TOOLBAR_ICONS);
+       tbar = pref_toolbar_new(scd->vbox);
 
        scd->add_button = pref_toolbar_button(tbar, GQ_ICON_ADD, _("Add"), FALSE,
                                        _("Add Shortcut"),

diff --git a/src/toolbar.cc b/src/toolbar.cc
index f4482b0..0096988 100644 (file)
--- a/src/toolbar.cc
+++ b/src/toolbar.cc
@@ -438,7 +438,7 @@ GtkWidget *toolbar_select_new(LayoutWindow *lw, ToolbarType bar)
        add_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
        gtk_widget_show(add_box);
        gq_gtk_box_pack_end(GTK_BOX(toolbarlist[bar]->widget), add_box, FALSE, FALSE, 0);
-       tbar = pref_toolbar_new(add_box, GTK_TOOLBAR_ICONS);
+       tbar = pref_toolbar_new(add_box);
        toolbarlist[bar]->add_button = pref_toolbar_button(tbar, GQ_ICON_ADD, _("Add"), FALSE,
                                                                                        _("Add Toolbar Item"),
                                                                                        G_CALLBACK(toolbar_menu_add_cb), toolbarlist[bar]);

diff --git a/src/ui-misc.cc b/src/ui-misc.cc
index 64982ba..25eb8f9 100644 (file)
--- a/src/ui-misc.cc
+++ b/src/ui-misc.cc
@@ -694,12 +694,11 @@ GtkWidget *pref_table_spin_new_int(GtkWidget *table, gint column, gint row,
 }
 
 
-GtkWidget *pref_toolbar_new(GtkWidget *parent_box, GtkToolbarStyle style)
+GtkWidget *pref_toolbar_new(GtkWidget *parent_box)
 {
        GtkWidget *tbar;
 
-       tbar = gtk_toolbar_new();
-       gtk_toolbar_set_style(GTK_TOOLBAR(tbar), style);
+       tbar = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
 
        if (parent_box)
                {

diff --git a/src/ui-misc.h b/src/ui-misc.h
index a953091..f81f2ba 100644 (file)
--- a/src/ui-misc.h
+++ b/src/ui-misc.h
@@ -180,7 +180,7 @@ GtkWidget *pref_table_spin_new_int(GtkWidget *table, gint column, gint row,
                                   gint value, gint *value_var);
 
 
-GtkWidget *pref_toolbar_new(GtkWidget *parent_box, GtkToolbarStyle style);
+GtkWidget *pref_toolbar_new(GtkWidget *parent_box);
 GtkWidget *pref_toolbar_button(GtkWidget *toolbar,
                               const gchar *icon_name, const gchar *label, gboolean toggle,
                               const gchar *description,