GTK4: gtk_box_pack_start() gtk_box_pack_end()
authorColin Clark <colin.clark@cclark.uk>
Wed, 20 Sep 2023 10:22:11 +0000 (11:22 +0100)
committerColin Clark <colin.clark@cclark.uk>
Wed, 20 Sep 2023 10:22:11 +0000 (11:22 +0100)
GTK4 migration

- gtk_box_pack_start() replaced by gtk_box_prepend()
- gtk_box_pack_end() replaced by gtk_box_append()

39 files changed:
src/advanced-exif.cc
src/bar-exif.cc
src/bar-gps.cc
src/bar-histogram.cc
src/bar-keywords.cc
src/bar-rating.cc
src/bar-sort.cc
src/bar.cc
src/cache-maint.cc
src/collect-dlg.cc
src/collect.cc
src/compat.h
src/desktop-file.cc
src/dupe.cc
src/editors.cc
src/fullscreen.cc
src/image.cc
src/layout-config.cc
src/layout-util.cc
src/layout.cc
src/logwindow.cc
src/osd.cc
src/pan-view/pan-view-filter.cc
src/pan-view/pan-view-search.cc
src/pan-view/pan-view.cc
src/preferences.cc
src/print.cc
src/search.cc
src/shortcuts.cc
src/toolbar.cc
src/ui-bookmark.cc
src/ui-fileops.cc
src/ui-help.cc
src/ui-misc.cc
src/ui-pathsel.cc
src/ui-tabcomp.cc
src/ui-utildlg.cc
src/utilops.cc
src/view-file/view-file.cc

index a67c90d..de6d2bc 100644 (file)
@@ -453,10 +453,10 @@ GtkWidget *advanced_exif_new(LayoutWindow *lw)
        gtk_label_set_xalign(GTK_LABEL(ew->label_file_name), 0.5);
        gtk_label_set_yalign(GTK_LABEL(ew->label_file_name), 0.5);
 
-       gtk_box_pack_start(GTK_BOX(box), ew->label_file_name, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(box), ew->label_file_name, TRUE, TRUE, 0);
        gtk_widget_show(ew->label_file_name);
 
-       gtk_box_pack_start(GTK_BOX(ew->vbox), box, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(ew->vbox), box, FALSE, FALSE, 0);
        gtk_widget_show(box);
 
 
@@ -510,7 +510,7 @@ GtkWidget *advanced_exif_new(LayoutWindow *lw)
        gq_gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(ew->scrolled), GTK_SHADOW_IN);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(ew->scrolled),
                                       GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
-       gtk_box_pack_start(GTK_BOX(ew->vbox), ew->scrolled, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(ew->vbox), ew->scrolled, TRUE, TRUE, 0);
        gtk_container_add(GTK_CONTAINER(ew->scrolled), ew->listview);
        gtk_widget_show(ew->listview);
        gtk_widget_show(ew->scrolled);
index 34c1886..985e8c5 100644 (file)
@@ -128,7 +128,7 @@ static void bar_pane_exif_setup_entry_box(PaneExifData *ped, ExifEntry *ee)
        gtk_label_set_xalign(GTK_LABEL(ee->title_label), horizontal ? 1.0 : 0.0);
        gtk_label_set_yalign(GTK_LABEL(ee->title_label), 0.5);
        gtk_size_group_add_widget(ped->size_group, ee->title_label);
-       gtk_box_pack_start(GTK_BOX(ee->box), ee->title_label, FALSE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(ee->box), ee->title_label, FALSE, TRUE, 0);
        gtk_widget_show(ee->title_label);
 
        if (editable)
@@ -146,7 +146,7 @@ static void bar_pane_exif_setup_entry_box(PaneExifData *ped, ExifEntry *ee)
                gtk_label_set_yalign(GTK_LABEL(ee->value_widget), 0.5);
                }
 
-       gtk_box_pack_start(GTK_BOX(ee->box), ee->value_widget, TRUE, TRUE, 1);
+       gq_gtk_box_pack_start(GTK_BOX(ee->box), ee->value_widget, TRUE, TRUE, 1);
        gtk_widget_show(ee->value_widget);
 }
 
@@ -175,7 +175,7 @@ static GtkWidget *bar_pane_exif_add_entry(PaneExifData *ped, const gchar *key, c
        g_signal_connect_after(G_OBJECT(ee->ebox), "destroy",
                               G_CALLBACK(bar_pane_exif_entry_destroy), ee);
 
-       gtk_box_pack_start(GTK_BOX(ped->vbox), ee->ebox, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(ped->vbox), ee->ebox, FALSE, FALSE, 0);
 
        bar_pane_exif_entry_dnd_init(ee->ebox);
        g_signal_connect(ee->ebox, "button_release_event", G_CALLBACK(bar_pane_exif_menu_cb), ped);
@@ -206,7 +206,7 @@ static void bar_pane_exif_reparent_entry(GtkWidget *entry, GtkWidget *pane)
 
        ee->ped = ped;
        gtk_size_group_add_widget(ped->size_group, ee->title_label);
-       gtk_box_pack_start(GTK_BOX(ped->vbox), entry, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(ped->vbox), entry, FALSE, FALSE, 0);
 }
 
 static void bar_pane_exif_entry_update_title(ExifEntry *ee)
index 197cd41..c12afb0 100644 (file)
@@ -941,7 +941,7 @@ GtkWidget *bar_pane_gps_new(const gchar *id, const gchar *title, const gchar *ma
        gpswidget = gtk_champlain_embed_new();
        view = gtk_champlain_embed_get_view(GTK_CHAMPLAIN_EMBED(gpswidget));
 
-       gtk_box_pack_start(GTK_BOX(vbox), gpswidget, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(vbox), gpswidget, TRUE, TRUE, 0);
        gtk_container_add(GTK_CONTAINER(frame), vbox);
 
        status = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,0);
@@ -958,10 +958,10 @@ GtkWidget *bar_pane_gps_new(const gchar *id, const gchar *title, const gchar *ma
        gtk_label_set_ellipsize(GTK_LABEL(state), PANGO_ELLIPSIZE_START);
        gtk_widget_set_tooltip_text(state, _("Zoom level"));
 
-       gtk_box_pack_start(GTK_BOX(status), GTK_WIDGET(slider), FALSE, FALSE, 0);
-       gtk_box_pack_start(GTK_BOX(status), GTK_WIDGET(state), FALSE, FALSE, 5);
-       gtk_box_pack_end(GTK_BOX(status), GTK_WIDGET(progress), FALSE, FALSE, 0);
-       gtk_box_pack_end(GTK_BOX(vbox),GTK_WIDGET(status), FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(status), GTK_WIDGET(slider), FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(status), GTK_WIDGET(state), FALSE, FALSE, 5);
+       gq_gtk_box_pack_end(GTK_BOX(status), GTK_WIDGET(progress), FALSE, FALSE, 0);
+       gq_gtk_box_pack_end(GTK_BOX(vbox),GTK_WIDGET(status), FALSE, FALSE, 0);
 
        layer = champlain_marker_layer_new();
        champlain_view_add_layer(view, CHAMPLAIN_LAYER(layer));
index 1bd38a2..60832dd 100644 (file)
@@ -290,7 +290,7 @@ static GtkWidget *bar_pane_histogram_new(const gchar *id, const gchar *title, gi
        g_signal_connect(G_OBJECT(phd->drawing_area), "draw",
                         G_CALLBACK(bar_pane_histogram_draw_cb), phd);
 
-       gtk_box_pack_start(GTK_BOX(phd->widget), phd->drawing_area, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(phd->widget), phd->drawing_area, TRUE, TRUE, 0);
        gtk_widget_show(phd->drawing_area);
        gtk_widget_add_events(phd->drawing_area, GDK_BUTTON_PRESS_MASK);
 
index 5b98b0c..c7c99b2 100644 (file)
@@ -1479,7 +1479,7 @@ static GtkWidget *bar_pane_keywords_new(const gchar *id, const gchar *title, con
 
        vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
        hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP);
-       gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
 
        pkd->widget = vbox;
        g_object_set_data(G_OBJECT(pkd->widget), "pane_data", pkd);
@@ -1492,7 +1492,7 @@ static GtkWidget *bar_pane_keywords_new(const gchar *id, const gchar *title, con
        gq_gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
                                       GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-       gtk_box_pack_start(GTK_BOX(hbox), scrolled, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), scrolled, TRUE, TRUE, 0);
        gtk_widget_show(scrolled);
 
        pkd->keyword_view = gtk_text_view_new();
@@ -1511,12 +1511,12 @@ static GtkWidget *bar_pane_keywords_new(const gchar *id, const gchar *title, con
                gq_gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
                gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
                                                GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-               gtk_box_pack_start(GTK_BOX(hbox), scrolled, TRUE, TRUE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(hbox), scrolled, TRUE, TRUE, 0);
                gtk_widget_show(scrolled);
                }
 
        pkd->autocomplete = gtk_entry_new();
-       gtk_box_pack_end(GTK_BOX(vbox), pkd->autocomplete, FALSE, FALSE, 0);
+       gq_gtk_box_pack_end(GTK_BOX(vbox), pkd->autocomplete, FALSE, FALSE, 0);
        gtk_widget_show(pkd->autocomplete);
        gtk_widget_show(vbox);
        gtk_widget_set_tooltip_text(pkd->autocomplete, "Keyword autocomplete");
index 50bb238..49c5667 100644 (file)
@@ -161,18 +161,18 @@ static GtkWidget *bar_pane_rating_new(const gchar *id, const gchar *title, gbool
        g_signal_connect(G_OBJECT(prd->widget), "destroy", G_CALLBACK(bar_pane_rating_destroy), prd);
 
        row_1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP);
-       gtk_box_pack_start(GTK_BOX(prd->widget), row_1, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(prd->widget), row_1, FALSE, FALSE, 0);
 
        radio_rejected = gtk_radio_button_new_with_label(nullptr, _("Rejected"));
-       gtk_box_pack_start(GTK_BOX(row_1), radio_rejected, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(row_1), radio_rejected, FALSE, FALSE, 0);
        g_signal_connect(radio_rejected, "released", G_CALLBACK(bar_pane_rating_selected_cb), prd);
 
        radio_unrated = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(radio_rejected), _("Unrated"));
-       gtk_box_pack_start(GTK_BOX(row_1), radio_unrated, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(row_1), radio_unrated, FALSE, FALSE, 0);
        g_signal_connect(radio_unrated, "released", G_CALLBACK(bar_pane_rating_selected_cb), prd);
 
        row_2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP);
-       gtk_box_pack_start(GTK_BOX(prd->widget), row_2, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(prd->widget), row_2, FALSE, FALSE, 0);
 
        i = 1;
        while (i <= 5)
@@ -182,7 +182,7 @@ static GtkWidget *bar_pane_rating_new(const gchar *id, const gchar *title, gbool
                radio_rating = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(radio_rejected), i_str);
                g_signal_connect(radio_rating, "released", G_CALLBACK(bar_pane_rating_selected_cb), prd);
 
-               gtk_box_pack_start(GTK_BOX(row_2), radio_rating, FALSE, FALSE, 1);
+               gq_gtk_box_pack_start(GTK_BOX(row_2), radio_rating, FALSE, FALSE, 1);
 
                g_free(i_str);
                i++;
index 7d5a6b6..836d2e2 100644 (file)
@@ -587,7 +587,7 @@ static void bar_sort_add_cb(GtkWidget *button, gpointer data)
        pref_label_new(hbox, _("Name:"));
 
        sd->dialog_name_entry = gtk_entry_new();
-       gtk_box_pack_start(GTK_BOX(hbox), sd->dialog_name_entry, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), sd->dialog_name_entry, TRUE, TRUE, 0);
        generic_dialog_attach_default(GENERIC_DIALOG(sd->dialog), sd->dialog_name_entry);
        gtk_widget_show(sd->dialog_name_entry);
 
@@ -666,11 +666,11 @@ static GtkWidget *bar_sort_new(LayoutWindow *lw, SortActionType action,
 
        label = gtk_label_new(_("Sort Manager"));
        pref_label_bold(label, TRUE, FALSE);
-       gtk_box_pack_start(GTK_BOX(sd->vbox), label, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(sd->vbox), label, FALSE, FALSE, 0);
        gtk_widget_show(label);
 
        combo = gtk_combo_box_text_new();
-       gtk_box_pack_start(GTK_BOX(sd->vbox), combo, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(sd->vbox), combo, FALSE, FALSE, 0);
        gtk_widget_show(combo);
 
        gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), _("Folders"));
@@ -737,7 +737,7 @@ static GtkWidget *bar_sort_new(LayoutWindow *lw, SortActionType action,
 
        sd->bookmarks = bookmark_list_new(SORT_KEY_FOLDERS, bar_sort_bookmark_select, sd);
        DEBUG_NAME(sd->bookmarks);
-       gtk_box_pack_start(GTK_BOX(sd->vbox), sd->bookmarks, TRUE, TRUE, 0);
+       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);
index a52e9f0..f6da00c 100644 (file)
@@ -647,7 +647,7 @@ void bar_add(GtkWidget *bar, GtkWidget *pane)
                gtk_widget_show(pd->title);
                }
 
-       gtk_box_pack_start(GTK_BOX(bd->vbox), expander, FALSE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(bd->vbox), expander, FALSE, TRUE, 0);
 
        g_signal_connect(expander, "button_release_event", G_CALLBACK(bar_menu_cb), bd);
        g_signal_connect(expander, "notify::expanded", G_CALLBACK(bar_expander_cb), pd);
@@ -762,17 +762,17 @@ GtkWidget *bar_new(LayoutWindow *lw)
        gtk_label_set_xalign(GTK_LABEL(bd->label_file_name), 0.5);
        gtk_label_set_yalign(GTK_LABEL(bd->label_file_name), 0.5);
 
-       gtk_box_pack_start(GTK_BOX(box), bd->label_file_name, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(box), bd->label_file_name, TRUE, TRUE, 0);
        gtk_widget_show(bd->label_file_name);
 
-       gtk_box_pack_start(GTK_BOX(bd->widget), box, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(bd->widget), box, FALSE, FALSE, 0);
        gtk_widget_show(box);
 
        scrolled = gq_gtk_scrolled_window_new(nullptr, nullptr);
        DEBUG_NAME(scrolled);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
                GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-       gtk_box_pack_start(GTK_BOX(bd->widget), scrolled, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(bd->widget), scrolled, TRUE, TRUE, 0);
        gtk_widget_show(scrolled);
 
 
@@ -782,7 +782,7 @@ GtkWidget *bar_new(LayoutWindow *lw)
 
        add_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
        DEBUG_NAME(add_box);
-       gtk_box_pack_end(GTK_BOX(bd->widget), add_box, FALSE, FALSE, 0);
+       gq_gtk_box_pack_end(GTK_BOX(bd->widget), add_box, FALSE, FALSE, 0);
        tbar = pref_toolbar_new(add_box, GTK_TOOLBAR_ICONS);
        bd->add_button = pref_toolbar_button(tbar, GQ_ICON_ADD, _("Add"), FALSE,
                                             _("Add Pane"), G_CALLBACK(bar_menu_add_cb), bd);
index b1b9410..c2c9598 100644 (file)
@@ -394,18 +394,18 @@ void cache_maintain_home(gboolean metadata, gboolean clear, GtkWidget *parent)
        gtk_window_set_default_size(GTK_WINDOW(cm->gd->dialog), PURGE_DIALOG_WIDTH, -1);
 
        hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-       gtk_box_pack_start(GTK_BOX(cm->gd->vbox), hbox, FALSE, FALSE, 5);
+       gq_gtk_box_pack_start(GTK_BOX(cm->gd->vbox), hbox, FALSE, FALSE, 5);
        gtk_widget_show(hbox);
 
        cm->entry = gtk_entry_new();
        gtk_widget_set_can_focus(cm->entry, FALSE);
        gtk_editable_set_editable(GTK_EDITABLE(cm->entry), FALSE);
-       gtk_box_pack_start(GTK_BOX(hbox), cm->entry, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), cm->entry, TRUE, TRUE, 0);
        gtk_widget_show(cm->entry);
 
        cm->spinner = gtk_spinner_new();
        gtk_spinner_start(GTK_SPINNER(cm->spinner));
-       gtk_box_pack_start(GTK_BOX(hbox), cm->spinner, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), cm->spinner, FALSE, FALSE, 0);
        gtk_widget_show(cm->spinner);
 
        gtk_widget_show(cm->gd->dialog);
@@ -904,7 +904,7 @@ static void cache_manager_render_dialog(GtkWidget *widget, const gchar *path)
 
        label = tab_completion_new(&cd->entry, path, nullptr, nullptr, nullptr, nullptr);
        tab_completion_add_select_button(cd->entry,_("Select folder") , TRUE);
-       gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
        gtk_widget_show(label);
 
        pref_checkbox_new_int(cd->group, _("Include subfolders"), FALSE, &cd->recurse);
@@ -918,15 +918,15 @@ static void cache_manager_render_dialog(GtkWidget *widget, const gchar *path)
        gtk_widget_set_can_focus(cd->progress, FALSE);
        gtk_editable_set_editable(GTK_EDITABLE(cd->progress), FALSE);
        gtk_entry_set_text(GTK_ENTRY(cd->progress), _("click start to begin"));
-       gtk_box_pack_start(GTK_BOX(hbox), cd->progress, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), cd->progress, TRUE, TRUE, 0);
        gtk_widget_show(cd->progress);
 
        cd->progress_bar = gtk_progress_bar_new();
-       gtk_box_pack_start(GTK_BOX(cd->gd->vbox), cd->progress_bar, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(cd->gd->vbox), cd->progress_bar, TRUE, TRUE, 0);
        gtk_widget_show(cd->progress_bar);
 
        cd->spinner = gtk_spinner_new();
-       gtk_box_pack_start(GTK_BOX(hbox), cd->spinner, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), cd->spinner, FALSE, FALSE, 0);
        gtk_widget_show(cd->spinner);
 
        cd->list = nullptr;
@@ -1171,7 +1171,7 @@ static void cache_manager_standard_process(GtkWidget *widget, gboolean clear)
        cd->progress = gtk_progress_bar_new();
        gtk_progress_bar_set_text(GTK_PROGRESS_BAR(cd->progress), _("click start to begin"));
        gtk_progress_bar_set_show_text(GTK_PROGRESS_BAR(cd->progress), TRUE);
-       gtk_box_pack_start(GTK_BOX(cd->gd->vbox), cd->progress, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(cd->gd->vbox), cd->progress, FALSE, FALSE, 0);
        gtk_widget_show(cd->progress);
 
        cd->days = 30;
@@ -1546,7 +1546,7 @@ static void cache_manager_sim_load_dialog(GtkWidget *widget, const gchar *path)
 
        label = tab_completion_new(&cd->entry, path, nullptr, nullptr, nullptr, nullptr);
        tab_completion_add_select_button(cd->entry,_("Select folder") , TRUE);
-       gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
        gtk_widget_show(label);
 
        pref_line(cd->gd->vbox, PREF_PAD_SPACE);
@@ -1556,15 +1556,15 @@ static void cache_manager_sim_load_dialog(GtkWidget *widget, const gchar *path)
        gtk_widget_set_can_focus(cd->progress, FALSE);
        gtk_editable_set_editable(GTK_EDITABLE(cd->progress), FALSE);
        gtk_entry_set_text(GTK_ENTRY(cd->progress), _("click start to begin"));
-       gtk_box_pack_start(GTK_BOX(hbox), cd->progress, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), cd->progress, TRUE, TRUE, 0);
        gtk_widget_show(cd->progress);
 
        cd->progress_bar = gtk_progress_bar_new();
-       gtk_box_pack_start(GTK_BOX(cd->gd->vbox), cd->progress_bar, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(cd->gd->vbox), cd->progress_bar, TRUE, TRUE, 0);
        gtk_widget_show(cd->progress_bar);
 
        cd->spinner = gtk_spinner_new();
-       gtk_box_pack_start(GTK_BOX(hbox), cd->spinner, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), cd->spinner, FALSE, FALSE, 0);
        gtk_widget_show(cd->spinner);
 
        cd->list = nullptr;
@@ -1662,7 +1662,7 @@ static void cache_manager_cache_maintenance_load_dialog(GtkWidget *widget, const
 
        label = tab_completion_new(&cd->entry, path, nullptr, nullptr, nullptr, nullptr);
        tab_completion_add_select_button(cd->entry,_("Select folder") , TRUE);
-       gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
        gtk_widget_show(label);
 
        cd->list = nullptr;
index 26db0c7..f33b4cb 100644 (file)
@@ -172,17 +172,17 @@ static void collection_save_or_append_dialog(gint type, CollectionData *cd)
                gtk_widget_show(existing_collections);
                gtk_container_add(GTK_CONTAINER(scrolled), viewport);
 
-               gtk_box_pack_start(GTK_BOX(gdlg->vbox), scrolled, TRUE,TRUE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(gdlg->vbox), scrolled, TRUE,TRUE, 0);
 
                save_as_label = gtk_label_new("Save collection as:");
-               gtk_box_pack_start(GTK_BOX(gdlg->vbox), save_as_label, FALSE,FALSE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(gdlg->vbox), save_as_label, FALSE,FALSE, 0);
                gtk_label_set_xalign(GTK_LABEL(save_as_label), 0.0);
                gtk_widget_show(save_as_label);
 
                cd->dialog_name_entry = gtk_entry_new();
                gtk_widget_show(cd->dialog_name_entry);
 
-               gtk_box_pack_start(GTK_BOX(gdlg->vbox), cd->dialog_name_entry, FALSE, FALSE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(gdlg->vbox), cd->dialog_name_entry, FALSE, FALSE, 0);
 
                gtk_entry_set_text(GTK_ENTRY(cd->dialog_name_entry), cd->name);
                gtk_widget_grab_focus(cd->dialog_name_entry);
@@ -222,7 +222,7 @@ static void collection_save_or_append_dialog(gint type, CollectionData *cd)
 
                gtk_widget_show(collection_append_combo);
 
-               gtk_box_pack_start(GTK_BOX(gdlg->vbox), collection_append_combo, TRUE,TRUE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(gdlg->vbox), collection_append_combo, TRUE,TRUE, 0);
                gtk_widget_show(GENERIC_DIALOG(gdlg)->dialog);
                }
 }
index a512995..d0d906d 100644 (file)
@@ -1370,17 +1370,17 @@ CollectWindow *collection_window_new(const gchar *path)
        gtk_widget_show(vbox);
 
        cw->table = collection_table_new(cw->cd);
-       gtk_box_pack_start(GTK_BOX(vbox), cw->table->scrolled, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(vbox), cw->table->scrolled, TRUE, TRUE, 0);
        gtk_widget_show(cw->table->scrolled);
 
        cw->status_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-       gtk_box_pack_start(GTK_BOX(vbox), cw->status_box, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(vbox), cw->status_box, FALSE, FALSE, 0);
        gtk_widget_show(cw->status_box);
 
        frame = gtk_frame_new(nullptr);
        DEBUG_NAME(frame);
        gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
-       gtk_box_pack_start(GTK_BOX(cw->status_box), frame, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(cw->status_box), frame, TRUE, TRUE, 0);
        gtk_widget_show(frame);
 
        status_label = gtk_label_new("");
@@ -1392,7 +1392,7 @@ CollectWindow *collection_window_new(const gchar *path)
        gtk_progress_bar_set_text(GTK_PROGRESS_BAR(extra_label), "");
        gtk_progress_bar_set_show_text(GTK_PROGRESS_BAR(extra_label), TRUE);
 
-       gtk_box_pack_start(GTK_BOX(cw->status_box), extra_label, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(cw->status_box), extra_label, TRUE, TRUE, 0);
        gtk_widget_show(extra_label);
 
        collection_table_set_labels(cw->table, status_label, extra_label);
index 55824e5..6863330 100644 (file)
 #endif
 
 #ifdef HAVE_GTK4
+       #define gq_gtk_box_pack_end(box, child, expand, fill, padding) gtk_box_append(box, child)
+       #define gq_gtk_box_pack_start(box, child, expand, fill, padding) gtk_box_prepend(box, child)
        #define gq_gtk_scrolled_window_new(hadjustment, vadjustment) gtk_scrolled_window_new()
        #define gq_gtk_scrolled_window_set_shadow_type(scrolled_window, type) gtk_scrolled_window_set_has_frame(scrolled_window, TRUE)
 #else
+       #define gq_gtk_box_pack_end(box, child, expand, fill, padding) gtk_box_pack_end(box, child, expand, fill, padding)
+       #define gq_gtk_box_pack_start(box, child, expand, fill, padding) gtk_box_pack_start(box, child, expand, fill, padding)
        #define gq_gtk_scrolled_window_new(hadjustment, vadjustment) gtk_scrolled_window_new(hadjustment, vadjustment)
        #define gq_gtk_scrolled_window_set_shadow_type(scrolled_window, type) gtk_scrolled_window_set_shadow_type(scrolled_window, type)
 #endif
index bf37d94..1bf280e 100644 (file)
@@ -198,11 +198,11 @@ static void editor_window_new(const gchar *src_path, const gchar *desktop_name)
        gtk_widget_show(win_vbox);
 
        hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
-       gtk_box_pack_end(GTK_BOX(win_vbox), hbox, FALSE, FALSE, 0);
+       gq_gtk_box_pack_end(GTK_BOX(win_vbox), hbox, FALSE, FALSE, 0);
        gtk_widget_show(hbox);
 
        ew->entry = gtk_entry_new();
-       gtk_box_pack_start(GTK_BOX(hbox), ew->entry, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), ew->entry, TRUE, TRUE, 0);
        ew->desktop_name = nullptr;
        if (desktop_name)
                {
@@ -215,7 +215,7 @@ static void editor_window_new(const gchar *src_path, const gchar *desktop_name)
        button_hbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
        gtk_button_box_set_layout(GTK_BUTTON_BOX(button_hbox), GTK_BUTTONBOX_END);
        gtk_box_set_spacing(GTK_BOX(button_hbox), PREF_PAD_BUTTON_GAP);
-       gtk_box_pack_end(GTK_BOX(hbox), button_hbox, FALSE, FALSE, 0);
+       gq_gtk_box_pack_end(GTK_BOX(hbox), button_hbox, FALSE, FALSE, 0);
        gtk_widget_show(button_hbox);
 
        ew->save_button = pref_button_new(nullptr, GQ_ICON_SAVE, _("Save"),
@@ -242,7 +242,7 @@ static void editor_window_new(const gchar *src_path, const gchar *desktop_name)
        gq_gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
                                       GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-       gtk_box_pack_start(GTK_BOX(win_vbox), scrolled, TRUE, TRUE, 5);
+       gq_gtk_box_pack_start(GTK_BOX(win_vbox), scrolled, TRUE, TRUE, 5);
        gtk_widget_show(scrolled);
 
        text_view = gtk_text_view_new();
@@ -556,7 +556,7 @@ static void editor_list_window_create()
        hbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
        gtk_button_box_set_layout(GTK_BUTTON_BOX(hbox), GTK_BUTTONBOX_END);
        gtk_box_set_spacing(GTK_BOX(hbox), PREF_PAD_BUTTON_GAP);
-       gtk_box_pack_end(GTK_BOX(win_vbox), hbox, FALSE, FALSE, 0);
+       gq_gtk_box_pack_end(GTK_BOX(win_vbox), hbox, FALSE, FALSE, 0);
        gtk_widget_show(hbox);
 
        button = pref_button_new(nullptr, GQ_ICON_HELP, _("Help"),
@@ -597,7 +597,7 @@ static void editor_list_window_create()
        gq_gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
                                       GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-       gtk_box_pack_start(GTK_BOX(win_vbox), scrolled, TRUE, TRUE, 5);
+       gq_gtk_box_pack_start(GTK_BOX(win_vbox), scrolled, TRUE, TRUE, 5);
        gtk_widget_show(scrolled);
 
        ewl->view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(desktop_file_list));
index 4374a8a..eb39b25 100644 (file)
@@ -3098,14 +3098,14 @@ static GtkWidget *dupe_display_label(GtkWidget *vbox, const gchar *description,
        hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
 
        label = gtk_label_new(description);
-       gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
        gtk_widget_show(label);
 
        label = gtk_label_new(text);
-       gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
        gtk_widget_show(label);
 
-       gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
        gtk_widget_show(hbox);
 
        return label;
@@ -3161,7 +3161,7 @@ static void dupe_display_stats(DupeWindow *dw, DupeItem *di)
                        }
 
                image = gtk_image_new_from_pixbuf(pixbuf);
-               gtk_box_pack_start(GTK_BOX(gd->vbox), image, FALSE, FALSE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(gd->vbox), image, FALSE, FALSE, 0);
                gtk_widget_show(image);
 
                g_object_unref(pixbuf);
@@ -4630,7 +4630,7 @@ DupeWindow *dupe_window_new()
        gtk_widget_show(vbox);
 
        dw->table = gtk_table_new(1, 3, FALSE);
-       gtk_box_pack_start(GTK_BOX(vbox), dw->table, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(vbox), dw->table, TRUE, TRUE, 0);
        gtk_widget_show(dw->table);
 
        scrolled = gq_gtk_scrolled_window_new(nullptr, nullptr);
@@ -4693,7 +4693,7 @@ DupeWindow *dupe_window_new()
        scrolled = gq_gtk_scrolled_window_new(nullptr, nullptr);
        gq_gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-       gtk_box_pack_start(GTK_BOX(dw->second_vbox), scrolled, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(dw->second_vbox), scrolled, TRUE, TRUE, 0);
        gtk_widget_show(scrolled);
 
        store = gtk_list_store_new(2, G_TYPE_POINTER, G_TYPE_STRING);
@@ -4711,19 +4711,19 @@ DupeWindow *dupe_window_new()
        gtk_widget_show(dw->second_listview);
 
        dw->second_status_label = gtk_label_new("");
-       gtk_box_pack_start(GTK_BOX(dw->second_vbox), dw->second_status_label, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(dw->second_vbox), dw->second_status_label, FALSE, FALSE, 0);
        gtk_widget_show(dw->second_status_label);
 
        pref_line(dw->second_vbox, GTK_ORIENTATION_HORIZONTAL);
 
        status_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-       gtk_box_pack_start(GTK_BOX(vbox), status_box, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(vbox), status_box, FALSE, FALSE, 0);
        gtk_widget_show(status_box);
 
        frame = gtk_frame_new(nullptr);
        DEBUG_NAME(frame);
        gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
-       gtk_box_pack_start(GTK_BOX(status_box), frame, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(status_box), frame, TRUE, TRUE, 0);
        gtk_widget_show(frame);
 
        dw->status_label = gtk_label_new("");
@@ -4734,7 +4734,7 @@ DupeWindow *dupe_window_new()
        gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(dw->extra_label), 0.0);
        gtk_progress_bar_set_text(GTK_PROGRESS_BAR(dw->extra_label), "");
        gtk_progress_bar_set_show_text(GTK_PROGRESS_BAR(dw->extra_label), TRUE);
-       gtk_box_pack_start(GTK_BOX(status_box), dw->extra_label, FALSE, FALSE, PREF_PAD_SPACE);
+       gq_gtk_box_pack_start(GTK_BOX(status_box), dw->extra_label, FALSE, FALSE, PREF_PAD_SPACE);
        gtk_widget_show(dw->extra_label);
 
        controls_box = pref_box_new(vbox, FALSE, GTK_ORIENTATION_HORIZONTAL, 0);
@@ -4746,32 +4746,32 @@ DupeWindow *dupe_window_new()
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dw->button_thumbs), dw->show_thumbs);
        g_signal_connect(G_OBJECT(dw->button_thumbs), "toggled",
                         G_CALLBACK(dupe_window_show_thumb_cb), dw);
-       gtk_box_pack_start(GTK_BOX(controls_box), dw->button_thumbs, FALSE, FALSE, PREF_PAD_SPACE);
+       gq_gtk_box_pack_start(GTK_BOX(controls_box), dw->button_thumbs, FALSE, FALSE, PREF_PAD_SPACE);
        gtk_widget_show(dw->button_thumbs);
 
        label = gtk_label_new(_("Compare by:"));
-       gtk_box_pack_start(GTK_BOX(controls_box), label, FALSE, FALSE, PREF_PAD_SPACE);
+       gq_gtk_box_pack_start(GTK_BOX(controls_box), label, FALSE, FALSE, PREF_PAD_SPACE);
        gtk_widget_show(label);
 
        dupe_menu_setup(dw);
-       gtk_box_pack_start(GTK_BOX(controls_box), dw->combo, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(controls_box), dw->combo, FALSE, FALSE, 0);
        gtk_widget_show(dw->combo);
 
        label = gtk_label_new(_("Custom Threshold"));
-       gtk_box_pack_start(GTK_BOX(controls_box), label, FALSE, FALSE, PREF_PAD_SPACE);
+       gq_gtk_box_pack_start(GTK_BOX(controls_box), label, FALSE, FALSE, PREF_PAD_SPACE);
        gtk_widget_show(label);
        dw->custom_threshold = gtk_spin_button_new_with_range(1, 100, 1);
        gtk_widget_set_tooltip_text(GTK_WIDGET(dw->custom_threshold), "Custom similarity threshold\n(Use tab key to set value)");
        gtk_spin_button_set_value(GTK_SPIN_BUTTON(dw->custom_threshold), options->duplicates_similarity_threshold);
        g_signal_connect(G_OBJECT(dw->custom_threshold), "value_changed", G_CALLBACK(dupe_window_custom_threshold_cb), dw);
-       gtk_box_pack_start(GTK_BOX(controls_box), dw->custom_threshold, FALSE, FALSE, PREF_PAD_SPACE);
+       gq_gtk_box_pack_start(GTK_BOX(controls_box), dw->custom_threshold, FALSE, FALSE, PREF_PAD_SPACE);
        gtk_widget_show(dw->custom_threshold);
 
        button = gtk_check_button_new_with_label(_("Sort"));
        gtk_widget_set_tooltip_text(GTK_WIDGET(button), "Sort by group totals");
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), options->sort_totals);
        g_signal_connect(G_OBJECT(button), "toggled", G_CALLBACK(dupe_sort_totals_toggle_cb), dw);
-       gtk_box_pack_start(GTK_BOX(controls_box), button, FALSE, FALSE, PREF_PAD_SPACE);
+       gq_gtk_box_pack_start(GTK_BOX(controls_box), button, FALSE, FALSE, PREF_PAD_SPACE);
        gtk_widget_show(button);
 
        dw->button_rotation_invariant = gtk_check_button_new_with_label(_("Ignore Orientation"));
@@ -4779,24 +4779,24 @@ DupeWindow *dupe_window_new()
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dw->button_rotation_invariant), options->rot_invariant_sim);
        g_signal_connect(G_OBJECT(dw->button_rotation_invariant), "toggled",
                         G_CALLBACK(dupe_window_rotation_invariant_cb), dw);
-       gtk_box_pack_start(GTK_BOX(controls_box), dw->button_rotation_invariant, FALSE, FALSE, PREF_PAD_SPACE);
+       gq_gtk_box_pack_start(GTK_BOX(controls_box), dw->button_rotation_invariant, FALSE, FALSE, PREF_PAD_SPACE);
        gtk_widget_show(dw->button_rotation_invariant);
 
        button = gtk_check_button_new_with_label(_("Compare two file sets"));
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), dw->second_set);
        g_signal_connect(G_OBJECT(button), "toggled",
                         G_CALLBACK(dupe_second_set_toggle_cb), dw);
-       gtk_box_pack_start(GTK_BOX(controls_box), button, FALSE, FALSE, PREF_PAD_SPACE);
+       gq_gtk_box_pack_start(GTK_BOX(controls_box), button, FALSE, FALSE, PREF_PAD_SPACE);
        gtk_widget_show(button);
 
        button_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-       gtk_box_pack_start(GTK_BOX(vbox), button_box, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(vbox), button_box, FALSE, FALSE, 0);
        gtk_widget_show(button_box);
 
        hbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
        gtk_button_box_set_layout(GTK_BUTTON_BOX(hbox), GTK_BUTTONBOX_END);
        gtk_box_set_spacing(GTK_BOX(hbox), PREF_PAD_SPACE);
-       gtk_box_pack_end(GTK_BOX(button_box), hbox, FALSE, FALSE, 0);
+       gq_gtk_box_pack_end(GTK_BOX(button_box), hbox, FALSE, FALSE, 0);
        gtk_widget_show(hbox);
 
        button = pref_button_new(nullptr, GQ_ICON_HELP, _("Help"), G_CALLBACK(dupe_help_cb), nullptr);
index c698bbd..94add07 100644 (file)
@@ -598,7 +598,7 @@ static EditorVerboseData *editor_verbose_window(EditorData *ed, const gchar *tex
        gq_gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
                                       GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-       gtk_box_pack_start(GTK_BOX(vd->gd->vbox), scrolled, TRUE, TRUE, 5);
+       gq_gtk_box_pack_start(GTK_BOX(vd->gd->vbox), scrolled, TRUE, TRUE, 5);
        gtk_widget_show(scrolled);
 
        vd->text = gtk_text_view_new();
@@ -608,19 +608,19 @@ static EditorVerboseData *editor_verbose_window(EditorData *ed, const gchar *tex
        gtk_widget_show(vd->text);
 
        hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-       gtk_box_pack_start(GTK_BOX(vd->gd->vbox), hbox, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(vd->gd->vbox), hbox, FALSE, FALSE, 0);
        gtk_widget_show(hbox);
 
        vd->progress = gtk_progress_bar_new();
        gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(vd->progress), 0.0);
-       gtk_box_pack_start(GTK_BOX(hbox), vd->progress, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), vd->progress, TRUE, TRUE, 0);
        gtk_progress_bar_set_text(GTK_PROGRESS_BAR(vd->progress), "");
        gtk_progress_bar_set_show_text(GTK_PROGRESS_BAR(vd->progress), TRUE);
        gtk_widget_show(vd->progress);
 
        vd->spinner = gtk_spinner_new();
        gtk_spinner_start(GTK_SPINNER(vd->spinner));
-       gtk_box_pack_start(GTK_BOX(hbox), vd->spinner, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), vd->spinner, FALSE, FALSE, 0);
        gtk_widget_show(vd->spinner);
 
        gtk_widget_show(vd->gd->dialog);
index 5ffc9be..5ac0f12 100644 (file)
@@ -675,7 +675,7 @@ GtkWidget *fullscreen_prefs_selection_new(const gchar *text, gint *screen_value,
 
        gtk_combo_box_set_active(GTK_COMBO_BOX(combo), current);
 
-       gtk_box_pack_start(GTK_BOX(hbox), combo, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), combo, FALSE, FALSE, 0);
        gtk_widget_show(combo);
 
        g_signal_connect(G_OBJECT(combo), "changed",
index 36e5333..af609b0 100644 (file)
@@ -2164,7 +2164,7 @@ void image_set_frame(ImageWindow *imd, gboolean frame)
                g_signal_connect(G_OBJECT(imd->frame), "focus_in_event",
                                 G_CALLBACK(image_focus_in_cb), imd);
 
-               gtk_box_pack_start(GTK_BOX(imd->widget), imd->frame, TRUE, TRUE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(imd->widget), imd->frame, TRUE, TRUE, 0);
                gtk_widget_show(imd->frame);
                }
        else
@@ -2176,7 +2176,7 @@ void image_set_frame(ImageWindow *imd, gboolean frame)
                        gtk_widget_destroy(imd->frame);
                        imd->frame = nullptr;
                        }
-               gtk_box_pack_start(GTK_BOX(imd->widget), imd->pr, TRUE, TRUE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(imd->widget), imd->pr, TRUE, TRUE, 0);
 
                g_object_unref(imd->pr);
                }
index 01234e9..ae05b9c 100644 (file)
@@ -251,7 +251,7 @@ static GtkWidget *layout_config_widget(GtkWidget *group, GtkWidget *box, gint st
        g_object_set_data(G_OBJECT(group), "layout_config", lc);
        g_signal_connect(G_OBJECT(group), "clicked",
                         G_CALLBACK(layout_config_widget_click_cb), GINT_TO_POINTER(style));
-       gtk_box_pack_start(GTK_BOX(box), group, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(box), group, FALSE, FALSE, 0);
 
        table = gtk_table_new(2, 2, TRUE);
 
@@ -303,7 +303,7 @@ GtkWidget *layout_config_new()
                         G_CALLBACK(layout_config_destroy), lc);
 
        hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
-       gtk_box_pack_start(GTK_BOX(lc->box), hbox, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(lc->box), hbox, FALSE, FALSE, 0);
        for (i = 0; i < layout_config_style_count; i++)
                {
                group = layout_config_widget(group, hbox, i, lc);
@@ -315,7 +315,7 @@ GtkWidget *layout_config_new()
        gq_gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
                                       GTK_POLICY_NEVER, GTK_POLICY_NEVER);
-       gtk_box_pack_start(GTK_BOX(lc->box), scrolled, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(lc->box), scrolled, FALSE, FALSE, 0);
        gtk_widget_show(scrolled);
 
        store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_INT);
index 235d3c0..62b767b 100644 (file)
@@ -2481,7 +2481,7 @@ static void layout_menu_window_rename_cb(GtkWidget *, gpointer data)
        gtk_widget_set_can_focus(rw->window_name_entry, TRUE);
        gtk_editable_set_editable(GTK_EDITABLE(rw->window_name_entry), TRUE);
        gtk_entry_set_text(GTK_ENTRY(rw->window_name_entry), lw->options.id);
-       gtk_box_pack_start(GTK_BOX(hbox), rw->window_name_entry, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), rw->window_name_entry, TRUE, TRUE, 0);
        gtk_widget_grab_focus(GTK_WIDGET(rw->window_name_entry));
        gtk_widget_show(rw->window_name_entry);
        g_signal_connect(rw->window_name_entry, "activate", G_CALLBACK(window_rename_entry_activate_cb), rw);
@@ -3483,8 +3483,8 @@ GtkWidget *layout_actions_menu_tool_bar(LayoutWindow *lw)
        DEBUG_NAME(toolbar);
        lw->menu_tool_bar = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
 
-       gtk_box_pack_start(GTK_BOX(lw->menu_tool_bar), menu_bar, FALSE, FALSE, 0);
-       gtk_box_pack_start(GTK_BOX(lw->menu_tool_bar), toolbar, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(lw->menu_tool_bar), menu_bar, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(lw->menu_tool_bar), toolbar, FALSE, FALSE, 0);
 
        g_object_ref(lw->menu_tool_bar);
        return lw->menu_tool_bar;
@@ -4131,7 +4131,7 @@ void layout_bar_sort_set(LayoutWindow *lw, GtkWidget *bar)
        g_signal_connect(G_OBJECT(lw->bar_sort), "destroy",
                         G_CALLBACK(layout_bar_sort_destroyed), lw);
 
-       gtk_box_pack_end(GTK_BOX(lw->utility_box), lw->bar_sort, FALSE, FALSE, 0);
+       gq_gtk_box_pack_end(GTK_BOX(lw->utility_box), lw->bar_sort, FALSE, FALSE, 0);
 }
 
 void layout_bar_sort_toggle(LayoutWindow *lw)
@@ -4217,7 +4217,7 @@ GtkWidget *layout_bars_prepare(LayoutWindow *lw, GtkWidget *image)
        lw->utility_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP);
        lw->utility_paned = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL);
        DEBUG_NAME(lw->utility_paned);
-       gtk_box_pack_start(GTK_BOX(lw->utility_box), lw->utility_paned, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(lw->utility_box), lw->utility_paned, TRUE, TRUE, 0);
 
        gtk_paned_pack1(GTK_PANED(lw->utility_paned), image, TRUE, FALSE);
        gtk_widget_show(lw->utility_paned);
index eb156ea..95a962e 100644 (file)
@@ -342,15 +342,15 @@ static GtkWidget *layout_tool_setup(LayoutWindow *lw)
                gtk_widget_show(scroll_window);
                gtk_widget_show(menu_bar);
 
-               gtk_box_pack_start(GTK_BOX(box), scroll_window, FALSE, FALSE, 0);
-               gtk_box_pack_start(GTK_BOX(box), toolbar, FALSE, FALSE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(box), scroll_window, FALSE, FALSE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(box), toolbar, FALSE, FALSE, 0);
                }
        else
                {
                menu_tool_bar = layout_actions_menu_tool_bar(lw);
                DEBUG_NAME(menu_tool_bar);
                gtk_widget_show(menu_tool_bar);
-               gtk_box_pack_start(GTK_BOX(lw->main_box), lw->menu_tool_bar, FALSE, FALSE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(lw->main_box), lw->menu_tool_bar, FALSE, FALSE, 0);
                }
 
        tabcomp = tab_completion_new_with_history(&lw->path_entry, nullptr, "path_list", -1,
@@ -358,7 +358,7 @@ static GtkWidget *layout_tool_setup(LayoutWindow *lw)
        DEBUG_NAME(tabcomp);
        tab_completion_add_tab_func(lw->path_entry, layout_path_entry_tab_cb, lw);
        tab_completion_add_append_func(lw->path_entry, layout_path_entry_tab_append_cb, lw);
-       gtk_box_pack_start(GTK_BOX(box), tabcomp, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(box), tabcomp, FALSE, FALSE, 0);
        gtk_widget_show(tabcomp);
        gtk_widget_set_has_tooltip(GTK_WIDGET(tabcomp), TRUE);
        g_signal_connect(G_OBJECT(tabcomp), "query_tooltip", G_CALLBACK(path_entry_tooltip_cb), lw);
@@ -368,7 +368,7 @@ static GtkWidget *layout_tool_setup(LayoutWindow *lw)
 
        box_folders = GTK_WIDGET(gtk_paned_new(GTK_ORIENTATION_HORIZONTAL));
        DEBUG_NAME(box_folders);
-       gtk_box_pack_start(GTK_BOX(box), box_folders, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(box), box_folders, TRUE, TRUE, 0);
 
        lw->vd = vd_new(lw);
 
@@ -476,7 +476,7 @@ static GtkWidget *layout_sort_button(LayoutWindow *lw, GtkWidget *box)
        frame = gtk_frame_new(nullptr);
        DEBUG_NAME(frame);
        gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
-       gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 0);
        gtk_widget_show(frame);
 
        image = gtk_image_new_from_icon_name(GQ_ICON_PAN_DOWN, GTK_ICON_SIZE_BUTTON);
@@ -573,7 +573,7 @@ static GtkWidget *layout_zoom_button(LayoutWindow *lw, GtkWidget *box, gint size
        if (size) gtk_widget_set_size_request(frame, size, -1);
        gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
 
-       gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 0);
 
        gtk_widget_show(frame);
 
@@ -802,11 +802,11 @@ static GtkWidget *layout_status_label(gchar *text, GtkWidget *box, gboolean star
        gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
        if (start)
                {
-               gtk_box_pack_start(GTK_BOX(box), frame, expand, expand, 0);
+               gq_gtk_box_pack_start(GTK_BOX(box), frame, expand, expand, 0);
                }
        else
                {
-               gtk_box_pack_end(GTK_BOX(box), frame, expand, expand, 0);
+               gq_gtk_box_pack_end(GTK_BOX(box), frame, expand, expand, 0);
                }
        gtk_widget_show(frame);
 
@@ -836,14 +836,14 @@ static void layout_status_setup(LayoutWindow *lw, GtkWidget *box, gboolean small
                lw->info_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
                DEBUG_NAME(lw->info_box);
                }
-       gtk_box_pack_end(GTK_BOX(box), lw->info_box, FALSE, FALSE, 0);
+       gq_gtk_box_pack_end(GTK_BOX(box), lw->info_box, FALSE, FALSE, 0);
        gtk_widget_show(lw->info_box);
 
        if (small_format)
                {
                hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
                DEBUG_NAME(hbox);
-               gtk_box_pack_start(GTK_BOX(lw->info_box), hbox, FALSE, FALSE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(lw->info_box), hbox, FALSE, FALSE, 0);
                gtk_widget_show(hbox);
                }
        else
@@ -857,7 +857,7 @@ static void layout_status_setup(LayoutWindow *lw, GtkWidget *box, gboolean small
        gtk_progress_bar_set_text(GTK_PROGRESS_BAR(lw->info_progress_bar), "");
        gtk_progress_bar_set_show_text(GTK_PROGRESS_BAR(lw->info_progress_bar), TRUE);
 
-       gtk_box_pack_start(GTK_BOX(hbox), lw->info_progress_bar, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), lw->info_progress_bar, FALSE, FALSE, 0);
        gtk_widget_show(lw->info_progress_bar);
 
        lw->info_sort = layout_sort_button(lw, hbox);
@@ -872,7 +872,7 @@ static void layout_status_setup(LayoutWindow *lw, GtkWidget *box, gboolean small
                {
                hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
                DEBUG_NAME(hbox);
-               gtk_box_pack_start(GTK_BOX(lw->info_box), hbox, FALSE, FALSE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(lw->info_box), hbox, FALSE, FALSE, 0);
                gtk_widget_show(hbox);
                }
        lw->info_details = layout_status_label(nullptr, hbox, TRUE, 0, TRUE);
@@ -886,7 +886,7 @@ static void layout_status_setup(LayoutWindow *lw, GtkWidget *box, gboolean small
        gtk_container_add(GTK_CONTAINER(toolbar_frame), toolbar);
        gtk_widget_show(toolbar_frame);
        gtk_widget_show(toolbar);
-       gtk_box_pack_end(GTK_BOX(hbox), toolbar_frame, FALSE, FALSE, 0);
+       gq_gtk_box_pack_end(GTK_BOX(hbox), toolbar_frame, FALSE, FALSE, 0);
        lw->info_zoom = layout_zoom_button(lw, hbox, ZOOM_LABEL_WIDTH, TRUE);
        gtk_widget_set_tooltip_text(GTK_WIDGET(lw->info_zoom), _("Select zoom and scroll mode"));
        gtk_widget_show(lw->info_zoom);
@@ -895,7 +895,7 @@ static void layout_status_setup(LayoutWindow *lw, GtkWidget *box, gboolean small
                {
                hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
                DEBUG_NAME(hbox);
-               gtk_box_pack_start(GTK_BOX(lw->info_box), hbox, FALSE, FALSE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(lw->info_box), hbox, FALSE, FALSE, 0);
                gtk_widget_show(hbox);
                }
        lw->info_pixel = layout_status_label(nullptr, hbox, FALSE, 0, small_format); /* expand only in small format */
@@ -1649,14 +1649,14 @@ static void layout_tools_setup(LayoutWindow *lw, GtkWidget *tools, GtkWidget *fi
        vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
        DEBUG_NAME(vbox);
        gtk_container_add(GTK_CONTAINER(lw->tools), vbox);
-       if (options->expand_menu_toolbar) gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(lw->menu_tool_bar), FALSE, FALSE, 0);
+       if (options->expand_menu_toolbar) gq_gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(lw->menu_tool_bar), FALSE, FALSE, 0);
        gtk_widget_show(vbox);
 
        layout_status_setup(lw, vbox, TRUE);
 
        lw->tools_pane = gtk_paned_new(vertical ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL);
        DEBUG_NAME(lw->tools_pane);
-       gtk_box_pack_start(GTK_BOX(vbox), lw->tools_pane, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(vbox), lw->tools_pane, TRUE, TRUE, 0);
        gtk_widget_show(lw->tools_pane);
 
        gtk_paned_pack1(GTK_PANED(lw->tools_pane), w1, FALSE, TRUE);
@@ -1796,11 +1796,11 @@ static void layout_grid_setup(LayoutWindow *lw)
        DEBUG_NAME(lw->group_box);
        if (options->expand_menu_toolbar)
                {
-               gtk_box_pack_end(GTK_BOX(lw->main_box), lw->group_box, TRUE, TRUE, 0);
+               gq_gtk_box_pack_end(GTK_BOX(lw->main_box), lw->group_box, TRUE, TRUE, 0);
                }
        else
                {
-               gtk_box_pack_start(GTK_BOX(lw->main_box), lw->group_box, TRUE, TRUE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(lw->main_box), lw->group_box, TRUE, TRUE, 0);
                }
        gtk_widget_show(lw->group_box);
 
@@ -1828,7 +1828,7 @@ static void layout_grid_setup(LayoutWindow *lw)
 
        if (lw->options.tools_float || lw->options.tools_hidden)
                {
-               gtk_box_pack_start(GTK_BOX(lw->group_box), image_sb, TRUE, TRUE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(lw->group_box), image_sb, TRUE, TRUE, 0);
                gtk_widget_show(image_sb);
 
                layout_tools_setup(lw, tools, files);
@@ -1864,7 +1864,7 @@ static void layout_grid_setup(LayoutWindow *lw)
                h = tmp;
                }
 
-       gtk_box_pack_start(GTK_BOX(lw->group_box), v, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(lw->group_box), v, TRUE, TRUE, 0);
 
        if (!layout_location_first(static_cast<LayoutLocation>(priority_location)))
                {
@@ -2336,7 +2336,7 @@ void layout_show_config_window(LayoutWindow *lw)
        hbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
        gtk_button_box_set_layout(GTK_BUTTON_BOX(hbox), GTK_BUTTONBOX_END);
        gtk_box_set_spacing(GTK_BOX(hbox), PREF_PAD_BUTTON_GAP);
-       gtk_box_pack_end(GTK_BOX(win_vbox), hbox, FALSE, FALSE, 0);
+       gq_gtk_box_pack_end(GTK_BOX(win_vbox), hbox, FALSE, FALSE, 0);
        gtk_widget_show(hbox);
 
        button = pref_button_new(nullptr, GQ_ICON_OK, "OK",
@@ -2393,7 +2393,7 @@ void layout_show_config_window(LayoutWindow *lw)
 
        tabcomp = tab_completion_new(&lc->home_path_entry, lc->options.home_path, nullptr, nullptr, nullptr, nullptr);
        tab_completion_add_select_button(lc->home_path_entry, nullptr, TRUE);
-       gtk_box_pack_start(GTK_BOX(hbox), tabcomp, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), tabcomp, TRUE, TRUE, 0);
        gtk_widget_show(tabcomp);
 
        button = pref_button_new(hbox, nullptr, _("Use current"),
@@ -2419,7 +2419,7 @@ void layout_show_config_window(LayoutWindow *lw)
        lc->layout_widget = layout_config_new();
        DEBUG_NAME(lc->layout_widget);
        layout_config_set(lc->layout_widget, lw->options.style, lw->options.order);
-       gtk_box_pack_start(GTK_BOX(group), lc->layout_widget, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(group), lc->layout_widget, TRUE, TRUE, 0);
 
        gtk_widget_show(lc->layout_widget);
        gtk_widget_show(lc->configwindow);
index 6609641..1453e55 100644 (file)
@@ -426,7 +426,7 @@ static LogWindow *log_window_create(LayoutWindow *lw)
        gq_gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwin),
                                            GTK_SHADOW_IN);
 
-       gtk_box_pack_start(GTK_BOX(win_vbox), scrolledwin, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(win_vbox), scrolledwin, TRUE, TRUE, 0);
        gtk_widget_show(scrolledwin);
 
        text = gtk_text_view_new();
@@ -459,7 +459,7 @@ static LogWindow *log_window_create(LayoutWindow *lw)
        label = gtk_label_new("Pause");
        gtk_widget_set_tooltip_text(GTK_WIDGET(logwin->pause), _("Pause scrolling"));
        gtk_container_add(GTK_CONTAINER(logwin->pause), label) ;
-       gtk_box_pack_start(GTK_BOX(hbox),logwin->pause, FALSE, FALSE, 0) ;
+       gq_gtk_box_pack_start(GTK_BOX(hbox),logwin->pause, FALSE, FALSE, 0) ;
        g_signal_connect(logwin->pause, "toggled", G_CALLBACK(log_window_pause_cb), logwin);
        gtk_widget_show_all(logwin->pause);
 
@@ -467,7 +467,7 @@ static LogWindow *log_window_create(LayoutWindow *lw)
        label = gtk_label_new("Wrap");
        gtk_widget_set_tooltip_text(GTK_WIDGET(logwin->wrap), _("Enable line wrap"));
        gtk_container_add(GTK_CONTAINER(logwin->wrap), label) ;
-       gtk_box_pack_start(GTK_BOX(hbox),logwin->wrap, FALSE, FALSE, 0) ;
+       gq_gtk_box_pack_start(GTK_BOX(hbox),logwin->wrap, FALSE, FALSE, 0) ;
        g_signal_connect(logwin->wrap, "toggled", G_CALLBACK(log_window_line_wrap_cb), logwin);
        gtk_widget_show_all(logwin->wrap);
 
@@ -475,7 +475,7 @@ static LogWindow *log_window_create(LayoutWindow *lw)
        label = gtk_label_new("Timer");
        gtk_widget_set_tooltip_text(GTK_WIDGET(logwin->timer_data), _("Enable timer data"));
        gtk_container_add(GTK_CONTAINER(logwin->timer_data), label) ;
-       gtk_box_pack_start(GTK_BOX(hbox),logwin->timer_data, FALSE, FALSE, 0) ;
+       gq_gtk_box_pack_start(GTK_BOX(hbox),logwin->timer_data, FALSE, FALSE, 0) ;
        if (options->log_window.timer_data)
                {
                gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(logwin->timer_data), TRUE);
@@ -488,7 +488,7 @@ static LogWindow *log_window_create(LayoutWindow *lw)
        gtk_widget_show(search_box);
 
        logwin->search_entry_box = gtk_entry_new();
-       gtk_box_pack_start(GTK_BOX(search_box), logwin->search_entry_box, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(search_box), logwin->search_entry_box, FALSE, FALSE, 0);
        gtk_widget_show(logwin->search_entry_box);
        gtk_entry_set_icon_from_icon_name(GTK_ENTRY(logwin->search_entry_box), GTK_ENTRY_ICON_PRIMARY, GQ_ICON_FIND);
        gtk_entry_set_icon_from_icon_name(GTK_ENTRY(logwin->search_entry_box), GTK_ENTRY_ICON_SECONDARY, GQ_ICON_CLEAR);
@@ -503,7 +503,7 @@ static LogWindow *log_window_create(LayoutWindow *lw)
        backwards_button = gtk_button_new();
        gtk_button_set_image(GTK_BUTTON(backwards_button), GTK_WIDGET(image));
        gtk_widget_set_tooltip_text(backwards_button, _("Search backwards"));
-       gtk_box_pack_start(GTK_BOX(search_box), backwards_button, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(search_box), backwards_button, FALSE, FALSE, 0);
        gtk_widget_show(backwards_button);
        g_signal_connect(backwards_button, "button_release_event", G_CALLBACK(backwards_keypress_event_cb), logwin);
        g_object_unref(pixbuf);
@@ -513,7 +513,7 @@ static LogWindow *log_window_create(LayoutWindow *lw)
        forwards_button = gtk_button_new();
        gtk_button_set_image(GTK_BUTTON(forwards_button), GTK_WIDGET(image));
        gtk_widget_set_tooltip_text(forwards_button, _("Search forwards"));
-       gtk_box_pack_start(GTK_BOX(search_box), forwards_button, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(search_box), forwards_button, FALSE, FALSE, 0);
        gtk_widget_show(forwards_button);
        g_signal_connect(forwards_button, "button_release_event", G_CALLBACK(forwards_keypress_event_cb), logwin);
        g_object_unref(pixbuf);
@@ -523,7 +523,7 @@ static LogWindow *log_window_create(LayoutWindow *lw)
        all_button = gtk_toggle_button_new();
        gtk_button_set_image(GTK_BUTTON(all_button), GTK_WIDGET(image));
        gtk_widget_set_tooltip_text(GTK_WIDGET(all_button), _("Highlight all"));
-       gtk_box_pack_start(GTK_BOX(search_box), all_button, FALSE, FALSE, 0) ;
+       gq_gtk_box_pack_start(GTK_BOX(search_box), all_button, FALSE, FALSE, 0) ;
        g_signal_connect(all_button, "toggled", G_CALLBACK(all_keypress_event_cb), logwin);
        gtk_widget_show_all(all_button);
        g_object_unref(pixbuf);
@@ -531,7 +531,7 @@ static LogWindow *log_window_create(LayoutWindow *lw)
        pref_label_new(hbox, _("Filter regexp"));
 
        textbox = gtk_entry_new();
-       gtk_box_pack_start(GTK_BOX(hbox), textbox, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), textbox, FALSE, FALSE, 0);
        gtk_entry_set_icon_from_icon_name(GTK_ENTRY(textbox), GTK_ENTRY_ICON_SECONDARY, GQ_ICON_CLEAR);
        gtk_widget_show(textbox);
        g_signal_connect(G_OBJECT(textbox), "activate",
index 8f0c82f..d38ce49 100644 (file)
@@ -164,7 +164,7 @@ GtkWidget *osd_new(gint max_cols, GtkWidget *template_view)
        pref_label_new(vbox, _("To include predefined tags in the template, click a button or drag-and-drop"));
 
        scrolled = gq_gtk_scrolled_window_new(nullptr, nullptr);
-       gtk_box_pack_start(GTK_BOX(vbox), scrolled, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(vbox), scrolled, FALSE, FALSE, 0);
        gtk_container_set_border_width(GTK_CONTAINER(scrolled), PREF_PAD_BORDER);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
                                       GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
index d63eb35..7d9118f 100644 (file)
@@ -69,22 +69,22 @@ PanViewFilterUi *pan_filter_ui_new(PanWindow *pw)
        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);
+       gq_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_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
-       gtk_box_pack_start(GTK_BOX(ui->filter_box), hbox, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(ui->filter_box), hbox, TRUE, TRUE, 0);
        gtk_widget_show(hbox);
 
        combo = tab_completion_new_with_history(&ui->filter_entry, "", "pan_view_filter", -1,
                                                pan_filter_activate_cb, pw);
-       gtk_box_pack_start(GTK_BOX(hbox), combo, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), combo, TRUE, TRUE, 0);
        gtk_widget_show(combo);
 
        ui->filter_label = gtk_label_new("");/** @todo (xsdg): Figure out whether it's useful to keep this label around. */
 
        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);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), ui->filter_kw_hbox, TRUE, TRUE, 0);
        gtk_widget_show(ui->filter_kw_hbox);
 
        // Build the spin-button to show/hide the filter UI.
@@ -95,7 +95,7 @@ PanViewFilterUi *pan_filter_ui_new(PanWindow *pw)
        gtk_container_add(GTK_CONTAINER(ui->filter_button), hbox);
        gtk_widget_show(hbox);
        ui->filter_button_arrow = gtk_image_new_from_icon_name(GQ_ICON_PAN_UP, GTK_ICON_SIZE_BUTTON);
-       gtk_box_pack_start(GTK_BOX(hbox), ui->filter_button_arrow, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), ui->filter_button_arrow, FALSE, FALSE, 0);
        gtk_widget_show(ui->filter_button_arrow);
        pref_label_new(hbox, _("Filter"));
 
@@ -106,7 +106,7 @@ PanViewFilterUi *pan_filter_ui_new(PanWindow *pw)
        for (i = 0; i < FILE_FORMAT_CLASSES; i++)
        {
                ui->filter_check_buttons[i] = gtk_check_button_new_with_label(_(format_class_list[i]));
-               gtk_box_pack_start(GTK_BOX(ui->filter_box), ui->filter_check_buttons[i], FALSE, FALSE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(ui->filter_box), ui->filter_check_buttons[i], FALSE, FALSE, 0);
                gtk_widget_show(ui->filter_check_buttons[i]);
        }
 
@@ -185,7 +185,7 @@ void pan_filter_activate_cb(const gchar *text, gpointer data)
        kw_button = gtk_button_new_with_label(label);
        g_clear_pointer(&label, g_free);
 
-       gtk_box_pack_start(GTK_BOX(ui->filter_kw_hbox), kw_button, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(ui->filter_kw_hbox), kw_button, FALSE, FALSE, 0);
        gtk_widget_show(kw_button);
 
        auto cb_state = g_new0(PanFilterCallbackState, 1);
@@ -229,7 +229,7 @@ void pan_filter_toggle_cb(GtkWidget *button, gpointer data)
                gtk_widget_destroy(ui->filter_button_arrow);
                ui->filter_button_arrow = gtk_image_new_from_icon_name(GQ_ICON_PAN_UP, GTK_ICON_SIZE_BUTTON);
 
-               gtk_box_pack_start(GTK_BOX(parent), ui->filter_button_arrow, FALSE, FALSE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(parent), ui->filter_button_arrow, FALSE, FALSE, 0);
                gtk_box_reorder_child(GTK_BOX(parent), ui->filter_button_arrow, 0);
 
                gtk_widget_show(ui->filter_button_arrow);
@@ -243,7 +243,7 @@ void pan_filter_toggle_cb(GtkWidget *button, gpointer data)
                gtk_widget_destroy(ui->filter_button_arrow);
                ui->filter_button_arrow = gtk_image_new_from_icon_name(GQ_ICON_PAN_DOWN, GTK_ICON_SIZE_BUTTON);
 
-               gtk_box_pack_start(GTK_BOX(parent), ui->filter_button_arrow, FALSE, FALSE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(parent), ui->filter_button_arrow, FALSE, FALSE, 0);
                gtk_box_reorder_child(GTK_BOX(parent), ui->filter_button_arrow, 0);
 
                gtk_widget_show(ui->filter_button_arrow);
index 33238b1..78c4e32 100644 (file)
@@ -40,16 +40,16 @@ PanViewSearchUi *pan_search_ui_new(PanWindow *pw)
        pref_label_new(ui->search_box, _("Find:"));
 
        hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
-       gtk_box_pack_start(GTK_BOX(ui->search_box), hbox, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(ui->search_box), hbox, TRUE, TRUE, 0);
        gtk_widget_show(hbox);
 
        combo = tab_completion_new_with_history(&ui->search_entry, "", "pan_view_search", -1,
                                                pan_search_activate_cb, pw);
-       gtk_box_pack_start(GTK_BOX(hbox), combo, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), combo, TRUE, TRUE, 0);
        gtk_widget_show(combo);
 
        ui->search_label = gtk_label_new("");
-       gtk_box_pack_start(GTK_BOX(hbox), ui->search_label, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), ui->search_label, TRUE, TRUE, 0);
        gtk_widget_show(ui->search_label);
 
        // Build the spin-button to show/hide the search UI.
@@ -60,7 +60,7 @@ PanViewSearchUi *pan_search_ui_new(PanWindow *pw)
        gtk_container_add(GTK_CONTAINER(ui->search_button), hbox);
        gtk_widget_show(hbox);
        ui->search_button_arrow = gtk_image_new_from_icon_name(GQ_ICON_PAN_UP, GTK_ICON_SIZE_BUTTON);
-       gtk_box_pack_start(GTK_BOX(hbox), ui->search_button_arrow, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), ui->search_button_arrow, FALSE, FALSE, 0);
        gtk_widget_show(ui->search_button_arrow);
        pref_label_new(hbox, _("Find"));
 
@@ -434,7 +434,7 @@ void pan_search_toggle_cb(GtkWidget *button, gpointer data)
                gtk_widget_destroy(ui->search_button_arrow);
                ui->search_button_arrow = gtk_image_new_from_icon_name(GQ_ICON_PAN_UP, GTK_ICON_SIZE_BUTTON);
 
-               gtk_box_pack_start(GTK_BOX(parent), ui->search_button_arrow, FALSE, FALSE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(parent), ui->search_button_arrow, FALSE, FALSE, 0);
                gtk_box_reorder_child(GTK_BOX(parent), ui->search_button_arrow, 0);
 
                gtk_widget_show(ui->search_button_arrow);
@@ -448,7 +448,7 @@ void pan_search_toggle_cb(GtkWidget *button, gpointer data)
                gtk_widget_destroy(ui->search_button_arrow);
                ui->search_button_arrow = gtk_image_new_from_icon_name(GQ_ICON_PAN_DOWN, GTK_ICON_SIZE_BUTTON);
 
-               gtk_box_pack_start(GTK_BOX(parent), ui->search_button_arrow, FALSE, FALSE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(parent), ui->search_button_arrow, FALSE, FALSE, 0);
                gtk_box_reorder_child(GTK_BOX(parent), ui->search_button_arrow, 0);
 
                gtk_widget_show(ui->search_button_arrow);
index f1cf737..c6111b8 100644 (file)
@@ -1851,7 +1851,7 @@ static void pan_window_new_real(FileData *dir_fd)
        pref_label_new(box, _("Location:"));
        combo = tab_completion_new_with_history(&pw->path_entry, dir_fd->path, "pan_view_path", -1,
                                                pan_window_entry_activate_cb, pw);
-       gtk_box_pack_start(GTK_BOX(box), combo, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(box), combo, TRUE, TRUE, 0);
        gtk_widget_show(combo);
 
        combo = gtk_combo_box_text_new();
@@ -1864,7 +1864,7 @@ static void pan_window_new_real(FileData *dir_fd)
        gtk_combo_box_set_active(GTK_COMBO_BOX(combo), pw->layout);
        g_signal_connect(G_OBJECT(combo), "changed",
                         G_CALLBACK(pan_window_layout_change_cb), pw);
-       gtk_box_pack_start(GTK_BOX(box), combo, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(box), combo, FALSE, FALSE, 0);
        gtk_widget_show(combo);
 
        combo = gtk_combo_box_text_new();
@@ -1882,7 +1882,7 @@ static void pan_window_new_real(FileData *dir_fd)
        gtk_combo_box_set_active(GTK_COMBO_BOX(combo), pw->size);
        g_signal_connect(G_OBJECT(combo), "changed",
                         G_CALLBACK(pan_window_layout_size_cb), pw);
-       gtk_box_pack_start(GTK_BOX(box), combo, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(box), combo, FALSE, FALSE, 0);
        gtk_widget_show(combo);
 
        table = pref_table_new(vbox, 2, 2, FALSE, TRUE);
@@ -1922,11 +1922,11 @@ static void pan_window_new_real(FileData *dir_fd)
        /* find bar */
 
        pw->search_ui = pan_search_ui_new(pw);
-       gtk_box_pack_start(GTK_BOX(vbox), pw->search_ui->search_box, FALSE, FALSE, 2);
+       gq_gtk_box_pack_start(GTK_BOX(vbox), pw->search_ui->search_box, FALSE, FALSE, 2);
 
     /* filter bar */
     pw->filter_ui = pan_filter_ui_new(pw);
-    gtk_box_pack_start(GTK_BOX(vbox), pw->filter_ui->filter_box, FALSE, FALSE, 2);
+    gq_gtk_box_pack_start(GTK_BOX(vbox), pw->filter_ui->filter_box, FALSE, FALSE, 2);
 
        /* status bar */
 
@@ -1936,7 +1936,7 @@ static void pan_window_new_real(FileData *dir_fd)
        DEBUG_NAME(frame);
        gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
        gtk_widget_set_size_request(frame, ZOOM_LABEL_WIDTH, -1);
-       gtk_box_pack_start(GTK_BOX(box), frame, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(box), frame, TRUE, TRUE, 0);
        gtk_widget_show(frame);
 
        hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
@@ -1950,7 +1950,7 @@ static void pan_window_new_real(FileData *dir_fd)
        DEBUG_NAME(frame);
        gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
        gtk_widget_set_size_request(frame, ZOOM_LABEL_WIDTH, -1);
-       gtk_box_pack_end(GTK_BOX(box), frame, FALSE, FALSE, 0);
+       gq_gtk_box_pack_end(GTK_BOX(box), frame, FALSE, FALSE, 0);
        gtk_widget_show(frame);
 
        pw->label_zoom = gtk_label_new("");
@@ -1958,11 +1958,11 @@ static void pan_window_new_real(FileData *dir_fd)
        gtk_widget_show(pw->label_zoom);
 
        // Add the "Find" button to the status bar area.
-       gtk_box_pack_end(GTK_BOX(box), pw->search_ui->search_button, FALSE, FALSE, 0);
+       gq_gtk_box_pack_end(GTK_BOX(box), pw->search_ui->search_button, FALSE, FALSE, 0);
        gtk_widget_show(pw->search_ui->search_button);
 
        // Add the "Filter" button to the status bar area.
-       gtk_box_pack_end(GTK_BOX(box), pw->filter_ui->filter_button, FALSE, FALSE, 0);
+       gq_gtk_box_pack_end(GTK_BOX(box), pw->filter_ui->filter_button, FALSE, FALSE, 0);
        gtk_widget_show(pw->filter_ui->filter_button);
 
        g_signal_connect(G_OBJECT(pw->window), "delete_event",
index 83ae3c5..7d94420 100644 (file)
@@ -1393,7 +1393,7 @@ static void safe_delete_clear_cb(GtkWidget *widget, gpointer)
        gtk_widget_set_can_focus(entry, FALSE);
        gtk_editable_set_editable(GTK_EDITABLE(entry), FALSE);
        if (options->file_ops.safe_delete_path) gtk_entry_set_text(GTK_ENTRY(entry), options->file_ops.safe_delete_path);
-       gtk_box_pack_start(GTK_BOX(gd->vbox), entry, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(gd->vbox), entry, FALSE, FALSE, 0);
        gtk_widget_show(entry);
        gtk_widget_show(gd->dialog);
 }
@@ -1963,13 +1963,13 @@ static void config_tab_general(GtkWidget *notebook)
        rating_symbol = g_strdup_printf("U+%X", options->star_rating.star);
        star_rating_entry = gtk_entry_new();
        gtk_entry_set_text(GTK_ENTRY(star_rating_entry), rating_symbol);
-       gtk_box_pack_start(GTK_BOX(hbox), star_rating_entry, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), star_rating_entry, FALSE, FALSE, 0);
        gtk_entry_set_width_chars(GTK_ENTRY(star_rating_entry), 15);
        gtk_widget_show(star_rating_entry);
        button = pref_button_new(nullptr, nullptr, _("Set"),
                                        G_CALLBACK(star_rating_star_test_cb), hbox);
        gtk_widget_set_tooltip_text(button, _("Display selected character"));
-       gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
        gtk_widget_show(button);
        gtk_widget_set_tooltip_text(star_rating_entry, _("Hexadecimal representation of a Unicode character. A list of all Unicode characters may be found on the Internet."));
        gtk_entry_set_icon_from_icon_name(GTK_ENTRY(star_rating_entry),
@@ -1995,13 +1995,13 @@ static void config_tab_general(GtkWidget *notebook)
        rating_symbol = g_strdup_printf("U+%X", options->star_rating.rejected);
        star_rating_entry = gtk_entry_new();
        gtk_entry_set_text(GTK_ENTRY(star_rating_entry), rating_symbol);
-       gtk_box_pack_start(GTK_BOX(hbox), star_rating_entry, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), star_rating_entry, FALSE, FALSE, 0);
        gtk_entry_set_width_chars(GTK_ENTRY(star_rating_entry), 15);
        gtk_widget_show(star_rating_entry);
        button = pref_button_new(nullptr, nullptr, _("Set"),
                                        G_CALLBACK(star_rating_rejected_test_cb), hbox);
        gtk_widget_set_tooltip_text(button, _("Display selected character"));
-       gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
        gtk_widget_show(button);
        gtk_widget_set_tooltip_text(star_rating_entry, _("Hexadecimal representation of a Unicode character. A list of all Unicode characters may be found on the Internet."));
        gtk_entry_set_icon_from_icon_name(GTK_ENTRY(star_rating_entry),
@@ -2152,7 +2152,7 @@ static void config_tab_general(GtkWidget *notebook)
 
        help_search_engine_entry = gtk_entry_new();
        gtk_entry_set_text(GTK_ENTRY(help_search_engine_entry), options->help_search_engine);
-       gtk_box_pack_start(GTK_BOX(group), help_search_engine_entry, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(group), help_search_engine_entry, FALSE, FALSE, 0);
        gtk_widget_show(help_search_engine_entry);
 
        gtk_widget_set_tooltip_text(help_search_engine_entry, _("The format varies between search engines, e.g the format may be:\nhttps://www.search_engine.com/search?q=site:geeqie.org/help\nhttps://www.search_engine.com/?q=site:geeqie.org/help"));
@@ -2364,7 +2364,7 @@ static void config_tab_windows(GtkWidget *notebook)
        c_options->fullscreen.screen = options->fullscreen.screen;
        c_options->fullscreen.above = options->fullscreen.above;
        hbox = fullscreen_prefs_selection_new(_("Location:"), &c_options->fullscreen.screen, &c_options->fullscreen.above);
-       gtk_box_pack_start(GTK_BOX(group), hbox, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(group), hbox, FALSE, FALSE, 0);
        gtk_widget_show(hbox);
 
        pref_checkbox_new_int(group, _("Smooth image flip"),
@@ -2397,7 +2397,7 @@ static void config_tab_osd(GtkWidget *notebook)
 
        scrolled_pre_formatted = osd_new(PRE_FORMATTED_COLUMNS, image_overlay_template_view);
        gtk_widget_set_size_request(scrolled_pre_formatted, 200, 150);
-       gtk_box_pack_start(GTK_BOX(subgroup), scrolled_pre_formatted, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(subgroup), scrolled_pre_formatted, FALSE, FALSE, 0);
        gtk_widget_show(scrolled_pre_formatted);
        gtk_widget_show(subgroup);
 
@@ -2410,7 +2410,7 @@ static void config_tab_osd(GtkWidget *notebook)
        gq_gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
                                                                        GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-       gtk_box_pack_start(GTK_BOX(group), scrolled, TRUE, TRUE, 5);
+       gq_gtk_box_pack_start(GTK_BOX(group), scrolled, TRUE, TRUE, 5);
        gtk_widget_show(scrolled);
 
        gtk_widget_set_tooltip_markup(image_overlay_template_view,
@@ -2424,28 +2424,28 @@ static void config_tab_osd(GtkWidget *notebook)
        button = pref_button_new(nullptr, GQ_ICON_SELECT_FONT, _("Font"),
                                 G_CALLBACK(image_overlay_set_font_cb), notebook);
 
-       gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
        gtk_widget_show(button);
 
        button = pref_button_new(nullptr, GQ_ICON_SELECT_COLOR, _("Text"),
                                 G_CALLBACK(image_overlay_set_text_colour_cb), nullptr);
-       gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
        gtk_widget_show(button);
 
        button = pref_button_new(nullptr, GQ_ICON_SELECT_COLOR, _("Background"),
                                 G_CALLBACK(image_overlay_set_background_colour_cb), nullptr);
-       gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
        gtk_widget_show(button);
        image_overlay_set_text_colours();
 
        button = pref_button_new(nullptr, nullptr, _("Defaults"),
                                 G_CALLBACK(image_overlay_default_template_cb), image_overlay_template_view);
-       gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+       gq_gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
        gtk_widget_show(button);
 
        button = pref_button_new(nullptr, GQ_ICON_HELP, _("Help"),
                                 G_CALLBACK(image_overlay_help_cb), nullptr);
-       gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+       gq_gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
        gtk_widget_show(button);
 
        buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(image_overlay_template_view));
@@ -2457,46 +2457,46 @@ static void config_tab_osd(GtkWidget *notebook)
 
        group = pref_group_new(vbox, FALSE, _("Exif, XMP or IPTC tags"), GTK_ORIENTATION_VERTICAL);
        hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-       gtk_box_pack_start(GTK_BOX(group), hbox, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(group), hbox, FALSE, FALSE, 0);
        gtk_widget_show(hbox);
        label = gtk_label_new(_("%Exif.Image.Orientation%"));
-       gtk_box_pack_start(GTK_BOX(hbox),label, FALSE,FALSE,0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox),label, FALSE,FALSE,0);
        gtk_widget_show(label);
        pref_spacer(group,TRUE);
 
        group = pref_group_new(vbox, FALSE, _("Field separators"), GTK_ORIENTATION_VERTICAL);
        hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-       gtk_box_pack_start(GTK_BOX(group), hbox, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(group), hbox, FALSE, FALSE, 0);
        gtk_widget_show(hbox);
        label = gtk_label_new(_("Separator shown only if both fields are non-null:\n%formatted.ShutterSpeed%|%formatted.ISOSpeedRating%"));
-       gtk_box_pack_start(GTK_BOX(hbox),label, FALSE,FALSE,0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox),label, FALSE,FALSE,0);
        gtk_widget_show(label);
        pref_spacer(group,TRUE);
 
        group = pref_group_new(vbox, FALSE, _("Field maximum length"), GTK_ORIENTATION_VERTICAL);
        hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-       gtk_box_pack_start(GTK_BOX(group), hbox, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(group), hbox, FALSE, FALSE, 0);
        gtk_widget_show(hbox);
        label = gtk_label_new(_("%path:39%"));
-       gtk_box_pack_start(GTK_BOX(hbox),label, FALSE,FALSE,0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox),label, FALSE,FALSE,0);
        gtk_widget_show(label);
        pref_spacer(group,TRUE);
 
        group = pref_group_new(vbox, FALSE, _("Pre- and post- text"), GTK_ORIENTATION_VERTICAL);
        hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-       gtk_box_pack_start(GTK_BOX(group), hbox, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(group), hbox, FALSE, FALSE, 0);
        gtk_widget_show(hbox);
        label = gtk_label_new(_("Text shown only if the field is non-null:\n%formatted.Aperture:F no. * setting%\n %formatted.Aperture:10:F no. * setting%"));
-       gtk_box_pack_start(GTK_BOX(hbox),label, FALSE,FALSE,0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox),label, FALSE,FALSE,0);
        gtk_widget_show(label);
        pref_spacer(group,TRUE);
 
        group = pref_group_new(vbox, FALSE, _("Pango markup"), GTK_ORIENTATION_VERTICAL);
        hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-       gtk_box_pack_start(GTK_BOX(group), hbox, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(group), hbox, FALSE, FALSE, 0);
        gtk_widget_show(hbox);
        label = gtk_label_new(_("<b>bold</b>\n<u>underline</u>\n<i>italic</i>\n<s>strikethrough</s>"));
-       gtk_box_pack_start(GTK_BOX(hbox),label, FALSE,FALSE,0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox),label, FALSE,FALSE,0);
        gtk_widget_show(label);
 }
 
@@ -2616,7 +2616,7 @@ static void config_tab_files(GtkWidget *notebook)
 
        sidecar_ext_entry = gtk_entry_new();
        gtk_entry_set_text(GTK_ENTRY(sidecar_ext_entry), options->sidecar.ext);
-       gtk_box_pack_start(GTK_BOX(group), sidecar_ext_entry, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(group), sidecar_ext_entry, FALSE, FALSE, 0);
        gtk_widget_show(sidecar_ext_entry);
 
        group = pref_group_new(vbox, TRUE, _("File types"), GTK_ORIENTATION_VERTICAL);
@@ -2629,7 +2629,7 @@ static void config_tab_files(GtkWidget *notebook)
        scrolled = gq_gtk_scrolled_window_new(nullptr, nullptr);
        gq_gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
-       gtk_box_pack_start(GTK_BOX(group), scrolled, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(group), scrolled, TRUE, TRUE, 0);
        gtk_widget_show(scrolled);
 
        filter_store = gtk_list_store_new(1, G_TYPE_POINTER);
@@ -2743,17 +2743,17 @@ static void config_tab_files(GtkWidget *notebook)
 
        button = pref_button_new(nullptr, nullptr, _("Defaults"),
                                 G_CALLBACK(filter_default_cb), filter_view);
-       gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+       gq_gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
        gtk_widget_show(button);
 
        button = pref_button_new(nullptr, GQ_ICON_REMOVE, _("Remove"),
                                 G_CALLBACK(filter_remove_cb), filter_view);
-       gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+       gq_gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
        gtk_widget_show(button);
 
        button = pref_button_new(nullptr, GQ_ICON_ADD, _("Add"),
                                 G_CALLBACK(filter_add_cb), filter_view);
-       gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+       gq_gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
        gtk_widget_show(button);
 }
 
@@ -3098,7 +3098,7 @@ static void keywords_find_dialog(GtkWidget *widget, const gchar *path)
 
        label = tab_completion_new(&kfd->entry, path, nullptr, nullptr, nullptr, nullptr);
        tab_completion_add_select_button(kfd->entry,_("Select folder") , TRUE);
-       gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
        gtk_widget_show(label);
 
        pref_checkbox_new_int(kfd->group, _("Include subfolders"), FALSE, &kfd->recurse);
@@ -3110,11 +3110,11 @@ static void keywords_find_dialog(GtkWidget *widget, const gchar *path)
        gtk_widget_set_can_focus(kfd->progress, FALSE);
        gtk_editable_set_editable(GTK_EDITABLE(kfd->progress), FALSE);
        gtk_entry_set_text(GTK_ENTRY(kfd->progress), _("click start to begin"));
-       gtk_box_pack_start(GTK_BOX(hbox), kfd->progress, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), kfd->progress, TRUE, TRUE, 0);
        gtk_widget_show(kfd->progress);
 
        kfd->spinner = gtk_spinner_new();
-       gtk_box_pack_start(GTK_BOX(hbox), kfd->spinner, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), kfd->spinner, FALSE, FALSE, 0);
        gtk_widget_show(kfd->spinner);
 
        kfd->list = nullptr;
@@ -3200,7 +3200,7 @@ static void config_tab_keywords(GtkWidget *notebook)
        keyword_text = gtk_text_view_new();
        gtk_widget_set_size_request(keyword_text, 20, 20);
        scrolled = gq_gtk_scrolled_window_new(nullptr, nullptr);
-       gtk_box_pack_start(GTK_BOX(group), scrolled, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(group), scrolled, TRUE, TRUE, 0);
        gtk_widget_show(scrolled);
 
 #ifdef HAVE_SPELL
@@ -3447,7 +3447,7 @@ static void config_tab_behavior(GtkWidget *notebook)
 
        tabcomp = tab_completion_new(&safe_delete_path_entry, options->file_ops.safe_delete_path, nullptr, nullptr, nullptr, nullptr);
        tab_completion_add_select_button(safe_delete_path_entry, nullptr, TRUE);
-       gtk_box_pack_start(GTK_BOX(hbox), tabcomp, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), tabcomp, TRUE, TRUE, 0);
        gtk_widget_show(tabcomp);
 
        hbox = pref_box_new(group, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_BUTTON_GAP);
@@ -3459,12 +3459,12 @@ static void config_tab_behavior(GtkWidget *notebook)
        gtk_widget_set_tooltip_markup(spin, _("Set to 0 for unlimited size"));
        button = pref_button_new(nullptr, nullptr, _("View"),
                                 G_CALLBACK(safe_delete_view_cb), nullptr);
-       gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+       gq_gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
        gtk_widget_show(button);
 
        button = pref_button_new(nullptr, GQ_ICON_CLEAR, nullptr,
                                 G_CALLBACK(safe_delete_clear_cb), nullptr);
-       gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+       gq_gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 
        c_options->file_ops.no_trash = options->file_ops.no_trash;
        c_options->file_ops.use_system_trash = options->file_ops.use_system_trash;
@@ -3636,7 +3636,7 @@ static void config_tab_accelerators(GtkWidget *notebook)
        scrolled = gq_gtk_scrolled_window_new(nullptr, nullptr);
        gq_gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
-       gtk_box_pack_start(GTK_BOX(group), scrolled, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(group), scrolled, TRUE, TRUE, 0);
        gtk_widget_show(scrolled);
 
        accel_store = gtk_tree_store_new(4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
@@ -3718,18 +3718,18 @@ static void config_tab_accelerators(GtkWidget *notebook)
 
        button = pref_button_new(nullptr, nullptr, _("Defaults"),
                                 G_CALLBACK(accel_default_cb), accel_view);
-       gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+       gq_gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
        gtk_widget_show(button);
 
        button = pref_button_new(nullptr, nullptr, _("Reset selected"),
                                 G_CALLBACK(accel_reset_cb), accel_view);
        gtk_widget_set_tooltip_text(button, _("Will only reset changes made before the settings are saved"));
-       gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+       gq_gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
        gtk_widget_show(button);
 
        button = pref_button_new(nullptr, nullptr, _("Clear selected"),
                                 G_CALLBACK(accel_clear_cb), accel_view);
-       gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+       gq_gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
        gtk_widget_show(button);
 }
 
@@ -3745,7 +3745,7 @@ static void config_tab_toolbar_main(GtkWidget *notebook)
        vbox = scrolled_notebook_page(notebook, _("Toolbar Main"));
 
        toolbardata = toolbar_select_new(lw, TOOLBAR_MAIN);
-       gtk_box_pack_start(GTK_BOX(vbox), toolbardata, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(vbox), toolbardata, TRUE, TRUE, 0);
        gtk_widget_show(vbox);
 }
 
@@ -3761,7 +3761,7 @@ static void config_tab_toolbar_status(GtkWidget *notebook)
        vbox = scrolled_notebook_page(notebook, _("Toolbar Status"));
 
        toolbardata = toolbar_select_new(lw, TOOLBAR_STATUS);
-       gtk_box_pack_start(GTK_BOX(vbox), toolbardata, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(vbox), toolbardata, TRUE, TRUE, 0);
        gtk_widget_show(vbox);
 }
 
@@ -3836,14 +3836,14 @@ static void config_tab_advanced(GtkWidget *notebook)
        external_preview_select_entry = gtk_entry_new();
        tabcomp = tab_completion_new(&external_preview_select_entry, options->external_preview.select, nullptr, nullptr, nullptr, nullptr);
        tab_completion_add_select_button(external_preview_select_entry, _("Select file identification tool"), FALSE);
-       gtk_box_pack_start(GTK_BOX(group), tabcomp, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(group), tabcomp, TRUE, TRUE, 0);
        gtk_widget_show(tabcomp);
 
        group = pref_group_new(vbox, FALSE, _("Preview extraction tool"), GTK_ORIENTATION_VERTICAL);
        external_preview_extract_entry = gtk_entry_new();
        tabcomp = tab_completion_new(&external_preview_extract_entry, options->external_preview.extract, nullptr, nullptr, nullptr, nullptr);
        tab_completion_add_select_button(external_preview_extract_entry, _("Select preview extraction tool"), FALSE);
-       gtk_box_pack_start(GTK_BOX(group), tabcomp, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(group), tabcomp, TRUE, TRUE, 0);
        gtk_widget_show(tabcomp);
 
        gtk_widget_show(vbox);
@@ -3978,7 +3978,7 @@ static void config_window_create(LayoutWindow *lw)
        notebook = gtk_notebook_new();
        gtk_notebook_set_tab_pos(GTK_NOTEBOOK(notebook), GTK_POS_LEFT);
        gtk_notebook_set_scrollable(GTK_NOTEBOOK(notebook), TRUE);
-       gtk_box_pack_start(GTK_BOX(win_vbox), notebook, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(win_vbox), notebook, TRUE, TRUE, 0);
 
        config_tab_general(notebook);
        config_tab_image(notebook);
@@ -4000,7 +4000,7 @@ static void config_window_create(LayoutWindow *lw)
        hbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
        gtk_button_box_set_layout(GTK_BUTTON_BOX(hbox), GTK_BUTTONBOX_END);
        gtk_box_set_spacing(GTK_BOX(hbox), PREF_PAD_BUTTON_GAP);
-       gtk_box_pack_end(GTK_BOX(win_vbox), hbox, FALSE, FALSE, 0);
+       gq_gtk_box_pack_end(GTK_BOX(win_vbox), hbox, FALSE, FALSE, 0);
        gtk_widget_show(hbox);
 
        button = pref_button_new(nullptr, GQ_ICON_HELP, _("Help"),
@@ -4282,7 +4282,7 @@ static void timezone_database_install_cb(GtkWidget *widget, gpointer data)
                generic_dialog_add_message(tz->gd, GQ_ICON_DIALOG_INFO, _("Downloading timezone database"), nullptr, FALSE);
 
                tz->progress = gtk_progress_bar_new();
-               gtk_box_pack_start(GTK_BOX(tz->gd->vbox), tz->progress, FALSE, FALSE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(tz->gd->vbox), tz->progress, FALSE, FALSE, 0);
                gtk_widget_show(tz->progress);
 
                gtk_widget_show(tz->gd->dialog);
index 68828b3..348eb26 100644 (file)
@@ -352,7 +352,7 @@ static void print_text_menu(GtkWidget *box, PrintWindow *pw)
        pref_checkbox_link_sensitivity(image_text_button, subgroup);
 
        hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-       gtk_box_pack_start(GTK_BOX(subgroup), hbox, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(subgroup), hbox, FALSE, FALSE, 0);
 
        /* order is important */
        button1 = pref_radiobutton_new(hbox, nullptr,  "Header 1",
@@ -373,7 +373,7 @@ static void print_text_menu(GtkWidget *box, PrintWindow *pw)
        image_text_template_view = gtk_text_view_new();
 
        scrolled_pre_formatted = osd_new(PRE_FORMATTED_COLUMNS, image_text_template_view);
-       gtk_box_pack_start(GTK_BOX(subgroup), scrolled_pre_formatted, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(subgroup), scrolled_pre_formatted, FALSE, FALSE, 0);
        gtk_widget_show(scrolled_pre_formatted);
        gtk_widget_show(subgroup);
 
@@ -385,7 +385,7 @@ static void print_text_menu(GtkWidget *box, PrintWindow *pw)
        gq_gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
                                                                        GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-       gtk_box_pack_start(GTK_BOX(subgroup), scrolled, TRUE, TRUE, 5);
+       gq_gtk_box_pack_start(GTK_BOX(subgroup), scrolled, TRUE, TRUE, 5);
        gtk_widget_show(scrolled);
 
        gtk_container_add(GTK_CONTAINER(scrolled), image_text_template_view);
@@ -401,7 +401,7 @@ static void print_text_menu(GtkWidget *box, PrintWindow *pw)
        button = pref_button_new(nullptr, GQ_ICON_SELECT_FONT, _("Font"),
                                 G_CALLBACK(print_set_font_cb), const_cast<char *>("Image text font"));
 
-       gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
        gtk_widget_show(button);
 
        pref_spacer(group, PREF_PAD_GAP);
@@ -415,7 +415,7 @@ static void print_text_menu(GtkWidget *box, PrintWindow *pw)
        pref_checkbox_link_sensitivity(page_text_button, subgroup);
 
        hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-       gtk_box_pack_start(GTK_BOX(subgroup), hbox, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(subgroup), hbox, FALSE, FALSE, 0);
 
        /* order is important */
        button2 = pref_radiobutton_new(hbox, nullptr, "Header 1",
@@ -438,7 +438,7 @@ static void print_text_menu(GtkWidget *box, PrintWindow *pw)
        gq_gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
                                       GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-       gtk_box_pack_start(GTK_BOX(subgroup), scrolled, TRUE, TRUE, 5);
+       gq_gtk_box_pack_start(GTK_BOX(subgroup), scrolled, TRUE, TRUE, 5);
        gtk_widget_show(scrolled);
 
        page_text_view = gtk_text_view_new();
@@ -455,7 +455,7 @@ static void print_text_menu(GtkWidget *box, PrintWindow *pw)
        button = pref_button_new(nullptr, GQ_ICON_SELECT_FONT, _("Font"),
                                 G_CALLBACK(print_set_font_cb), const_cast<char *>("Page text font"));
 
-       gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
        gtk_widget_show(button);
 }
 
index 786c807..b25e965 100644 (file)
@@ -3053,7 +3053,7 @@ static GtkWidget *menu_spin(GtkWidget *box, gdouble min, gdouble max, gint value
        adj = gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(spin));
        if (func) g_signal_connect(G_OBJECT(adj), "value_changed",
                                   G_CALLBACK(func), data);
-       gtk_box_pack_start(GTK_BOX(box), spin, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(box), spin, FALSE, FALSE, 0);
        gtk_widget_show(spin);
 
        return spin;
@@ -3117,18 +3117,18 @@ static GtkWidget *menu_choice(GtkWidget *box, GtkWidget **check, GtkWidget **men
        GtkWidget *option;
 
        base_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP);
-       gtk_box_pack_start(GTK_BOX(box), base_box, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(box), base_box, FALSE, FALSE, 0);
        gtk_widget_show(base_box);
 
        button = gtk_check_button_new();
        if (value) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), *value);
-       gtk_box_pack_start(GTK_BOX(base_box), button, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(base_box), button, FALSE, FALSE, 0);
        gtk_widget_show(button);
        if (check) *check = button;
        if (value) g_object_set_data(G_OBJECT(button), "check_var", value);
 
        hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
-       gtk_box_pack_start(GTK_BOX(base_box), hbox, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(base_box), hbox, TRUE, TRUE, 0);
        gtk_widget_show(hbox);
 
        g_signal_connect(G_OBJECT(button), "toggled",
@@ -3140,7 +3140,7 @@ static GtkWidget *menu_choice(GtkWidget *box, GtkWidget **check, GtkWidget **men
        if (!items && !menu) return hbox;
 
        option = menu_choice_menu(items, item_count, func, data);
-       gtk_box_pack_start(GTK_BOX(hbox), option, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), option, FALSE, FALSE, 0);
        gtk_widget_show(option);
        if (menu) *menu = option;
 
@@ -3369,7 +3369,7 @@ void search_new(FileData *dir_fd, FileData *example_file)
 
        sd->menu_path = menu_choice_menu(text_search_menu_path, sizeof(text_search_menu_path) / sizeof(MatchList),
                                         G_CALLBACK(menu_choice_path_cb), sd);
-       gtk_box_pack_start(GTK_BOX(hbox), sd->menu_path, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), sd->menu_path, FALSE, FALSE, 0);
        gtk_widget_show(sd->menu_path);
 
        hbox2 = pref_box_new(hbox, TRUE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
@@ -3377,7 +3377,7 @@ void search_new(FileData *dir_fd, FileData *example_file)
                                                "search_path", -1,
                                                nullptr, nullptr);
        tab_completion_add_select_button(sd->path_entry, nullptr, TRUE);
-       gtk_box_pack_start(GTK_BOX(hbox2), combo, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox2), combo, TRUE, TRUE, 0);
        gtk_widget_show(combo);
        sd->check_recurse = pref_checkbox_new_int(hbox2, _("Recurse"),
                                                  sd->search_path_recurse, &sd->search_path_recurse);
@@ -3385,12 +3385,12 @@ void search_new(FileData *dir_fd, FileData *example_file)
        sd->collection = pref_box_new(hbox, TRUE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
        sd->collection_entry = gtk_entry_new();
        gtk_entry_set_text(GTK_ENTRY(sd->collection_entry), "");
-       gtk_box_pack_start(GTK_BOX(sd->collection), sd->collection_entry, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(sd->collection), sd->collection_entry, TRUE, TRUE, 0);
        gtk_widget_show(sd->collection_entry);
 
        sd->fd_button = gtk_button_new_with_label("...");
        g_signal_connect(G_OBJECT(sd->fd_button), "clicked", G_CALLBACK(select_collection_clicked_cb), sd);
-       gtk_box_pack_start(GTK_BOX(sd->collection), sd->fd_button, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(sd->collection), sd->fd_button, FALSE, FALSE, 0);
        gtk_widget_show(sd->fd_button);
 
        gtk_widget_hide(sd->collection);
@@ -3401,7 +3401,7 @@ void search_new(FileData *dir_fd, FileData *example_file)
                           text_search_menu_name, sizeof(text_search_menu_name) / sizeof(MatchList),
                           G_CALLBACK(menu_choice_name_cb), sd);
        combo = history_combo_new(&sd->entry_name, "", "search_name", -1);
-       gtk_box_pack_start(GTK_BOX(hbox), combo, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), combo, TRUE, TRUE, 0);
        gtk_widget_show(combo);
        pref_checkbox_new_int(hbox, _("Match case"),
                              sd->search_name_match_case, &sd->search_name_match_case);
@@ -3415,7 +3415,7 @@ void search_new(FileData *dir_fd, FileData *example_file)
        sd->spin_size = menu_spin(hbox, 0, 1024*1024*1024, sd->search_size,
                                  G_CALLBACK(menu_choice_spin_cb), &sd->search_size);
        hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
-       gtk_box_pack_start(GTK_BOX(hbox), hbox2, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), hbox2, FALSE, FALSE, 0);
        pref_label_new(hbox2, _("and"));
        sd->spin_size_end = menu_spin(hbox2, 0, 1024*1024*1024, sd->search_size_end,
                                      G_CALLBACK(menu_choice_spin_cb), &sd->search_size_end);
@@ -3428,15 +3428,15 @@ void search_new(FileData *dir_fd, FileData *example_file)
 
        sd->date_sel = date_selection_new();
        date_selection_time_set(sd->date_sel, time(nullptr));
-       gtk_box_pack_start(GTK_BOX(hbox), sd->date_sel, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), sd->date_sel, FALSE, FALSE, 0);
        gtk_widget_show(sd->date_sel);
 
        hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
-       gtk_box_pack_start(GTK_BOX(hbox), hbox2, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), hbox2, FALSE, FALSE, 0);
        pref_label_new(hbox2, _("and"));
        sd->date_sel_end = date_selection_new();
        date_selection_time_set(sd->date_sel_end, time(nullptr));
-       gtk_box_pack_start(GTK_BOX(hbox2), sd->date_sel_end, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox2), sd->date_sel_end, FALSE, FALSE, 0);
        gtk_widget_show(sd->date_sel_end);
 
        sd->date_type = gtk_combo_box_text_new();
@@ -3444,7 +3444,7 @@ void search_new(FileData *dir_fd, FileData *example_file)
        gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(sd->date_type), _("Status Changed"));
        gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(sd->date_type), _("Original"));
        gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(sd->date_type), _("Digitized"));
-       gtk_box_pack_start(GTK_BOX(hbox), sd->date_type, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), sd->date_type, FALSE, FALSE, 0);
        gtk_combo_box_set_active(GTK_COMBO_BOX(sd->date_type), 0);
        gtk_widget_set_tooltip_text(sd->date_type, "Modified (mtime)\nStatus Changed (ctime)\nOriginal (Exif.Photo.DateTimeOriginal)\nDigitized (Exif.Photo.DateTimeDigitized)");
        gtk_widget_show(sd->date_type);
@@ -3461,7 +3461,7 @@ void search_new(FileData *dir_fd, FileData *example_file)
        sd->spin_height = menu_spin(pad_box, 0, 1000000, sd->search_height,
                                    G_CALLBACK(menu_choice_spin_cb), &sd->search_height);
        hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2);
-       gtk_box_pack_start(GTK_BOX(hbox), hbox2, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), hbox2, FALSE, FALSE, 0);
        pref_label_new(hbox2, _("and"));
        pref_spacer(hbox2, PREF_PAD_SPACE - 2*2);
        sd->spin_width_end = menu_spin(hbox2, 0, 1000000, sd->search_width_end,
@@ -3484,7 +3484,7 @@ void search_new(FileData *dir_fd, FileData *example_file)
                                                (sd->search_similarity_path) ? sd->search_similarity_path : "",
                                                "search_similarity_path", -1, nullptr, nullptr);
        tab_completion_add_select_button(sd->entry_similarity, nullptr, FALSE);
-       gtk_box_pack_start(GTK_BOX(hbox), combo, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), combo, TRUE, TRUE, 0);
        gtk_widget_show(combo);
        pref_checkbox_new_int(hbox, _("Ignore rotation"),
                                options->rot_invariant_sim, &options->rot_invariant_sim);
@@ -3495,7 +3495,7 @@ void search_new(FileData *dir_fd, FileData *example_file)
                           text_search_menu_keyword, sizeof(text_search_menu_keyword) / sizeof(MatchList),
                           G_CALLBACK(menu_choice_keyword_cb), sd);
        sd->entry_keywords = gtk_entry_new();
-       gtk_box_pack_start(GTK_BOX(hbox), sd->entry_keywords, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), sd->entry_keywords, TRUE, TRUE, 0);
        gtk_widget_set_sensitive(sd->entry_keywords, sd->match_keywords_enable);
        g_signal_connect(G_OBJECT(sd->check_keywords), "toggled",
                         G_CALLBACK(menu_choice_check_cb), sd->entry_keywords);
@@ -3507,7 +3507,7 @@ void search_new(FileData *dir_fd, FileData *example_file)
                        text_search_menu_comment, sizeof(text_search_menu_comment) / sizeof(MatchList),
                        G_CALLBACK(menu_choice_comment_cb), sd);
        sd->entry_comment = gtk_entry_new();
-       gtk_box_pack_start(GTK_BOX(hbox), sd->entry_comment, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), sd->entry_comment, TRUE, TRUE, 0);
        gtk_widget_set_sensitive(sd->entry_comment, sd->match_comment_enable);
        g_signal_connect(G_OBJECT(sd->check_comment), "toggled",
                        G_CALLBACK(menu_choice_check_cb), sd->entry_comment);
@@ -3524,7 +3524,7 @@ void search_new(FileData *dir_fd, FileData *example_file)
        sd->spin_size = menu_spin(hbox, -1, 5, sd->search_rating,
                                  G_CALLBACK(menu_choice_spin_cb), &sd->search_rating);
        hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
-       gtk_box_pack_start(GTK_BOX(hbox), hbox2, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), hbox2, FALSE, FALSE, 0);
        pref_label_new(hbox2, _("and"));
        sd->spin_rating_end = menu_spin(hbox2, -1, 5, sd->search_rating_end,
                                      G_CALLBACK(menu_choice_spin_cb), &sd->search_rating_end);
@@ -3537,7 +3537,7 @@ void search_new(FileData *dir_fd, FileData *example_file)
                           G_CALLBACK(menu_choice_gps_cb), sd);
 
        hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
-       gtk_box_pack_start(GTK_BOX(hbox), hbox2, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), hbox2, FALSE, FALSE, 0);
        sd->spin_gps = menu_spin(hbox2, 1, 9999, sd->search_gps,
                                                                   G_CALLBACK(menu_choice_spin_cb), &sd->search_gps);
 
@@ -3545,7 +3545,7 @@ void search_new(FileData *dir_fd, FileData *example_file)
        gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(sd->units_gps), _("km"));
        gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(sd->units_gps), _("miles"));
        gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(sd->units_gps), _("n.m."));
-       gtk_box_pack_start(GTK_BOX(hbox2), sd->units_gps, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox2), sd->units_gps, FALSE, FALSE, 0);
        gtk_combo_box_set_active(GTK_COMBO_BOX(sd->units_gps), 0);
        gtk_widget_set_tooltip_text(sd->units_gps, "kilometres, miles or nautical miles");
        gtk_widget_show(sd->units_gps);
@@ -3556,7 +3556,7 @@ void search_new(FileData *dir_fd, FileData *example_file)
        gtk_editable_set_editable(GTK_EDITABLE(sd->entry_gps_coord), TRUE);
        gtk_widget_set_has_tooltip(sd->entry_gps_coord, TRUE);
        gtk_widget_set_tooltip_text(sd->entry_gps_coord, _("Enter a coordinate in the form:\n89.123 179.456\nor drag-and-drop a geo-coded image\nor left-click on the map and paste\nor cut-and-paste or drag-and-drop\nan internet search URL\nSee the Help file"));
-       gtk_box_pack_start(GTK_BOX(hbox2), sd->entry_gps_coord, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox2), sd->entry_gps_coord, TRUE, TRUE, 0);
        gtk_widget_set_sensitive(sd->entry_gps_coord, TRUE);
 
        gtk_widget_show(sd->entry_gps_coord);
@@ -3575,7 +3575,7 @@ void search_new(FileData *dir_fd, FileData *example_file)
        gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(sd->class_type), _("Metadata"));
        gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(sd->class_type), _("Unknown"));
        gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(sd->class_type), _("Broken"));
-       gtk_box_pack_start(GTK_BOX(hbox), sd->class_type, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), sd->class_type, FALSE, FALSE, 0);
        gtk_combo_box_set_active(GTK_COMBO_BOX(sd->class_type), 0);
        gtk_widget_show(sd->class_type);
 
@@ -3603,7 +3603,7 @@ void search_new(FileData *dir_fd, FileData *example_file)
                        }
                g_free(marks_string);
                }
-       gtk_box_pack_start(GTK_BOX(hbox), sd->marks_type, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), sd->marks_type, FALSE, FALSE, 0);
        gtk_combo_box_set_active(GTK_COMBO_BOX(sd->marks_type), 0);
        gtk_widget_show(sd->marks_type);
 
@@ -3613,7 +3613,7 @@ void search_new(FileData *dir_fd, FileData *example_file)
        gq_gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
                                       GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-       gtk_box_pack_start(GTK_BOX(vbox), scrolled, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(vbox), scrolled, TRUE, TRUE, 0);
        gtk_widget_show(scrolled);
 
        store = gtk_list_store_new(8, G_TYPE_POINTER, G_TYPE_INT, GDK_TYPE_PIXBUF,
@@ -3680,7 +3680,7 @@ void search_new(FileData *dir_fd, FileData *example_file)
        frame = gtk_frame_new(nullptr);
        DEBUG_NAME(frame);
        gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
-       gtk_box_pack_start(GTK_BOX(hbox), frame, TRUE, TRUE, PREF_PAD_SPACE);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), frame, TRUE, TRUE, PREF_PAD_SPACE);
        gtk_widget_show(frame);
 
        sd->label_status = gtk_label_new("");
@@ -3694,11 +3694,11 @@ void search_new(FileData *dir_fd, FileData *example_file)
        gtk_progress_bar_set_text(GTK_PROGRESS_BAR(sd->label_progress), "");
        gtk_progress_bar_set_show_text(GTK_PROGRESS_BAR(sd->label_progress), TRUE);
 
-       gtk_box_pack_start(GTK_BOX(hbox), sd->label_progress, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), sd->label_progress, TRUE, TRUE, 0);
        gtk_widget_show(sd->label_progress);
 
        sd->spinner = gtk_spinner_new();
-       gtk_box_pack_start(GTK_BOX(hbox), sd->spinner, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), sd->spinner, FALSE, FALSE, 0);
        gtk_widget_show(sd->spinner);
 
        sd->button_help = pref_button_new(hbox, GQ_ICON_HELP, _("Help"), G_CALLBACK(search_window_help_cb), sd);
index e9310cd..f43dcea 100644 (file)
@@ -117,7 +117,7 @@ static void shortcuts_add_cb(GtkWidget *button, gpointer data)
        pref_label_new(hbox, _("Name:"));
 
        scd->dialog_name_entry = gtk_entry_new();
-       gtk_box_pack_start(GTK_BOX(hbox), scd->dialog_name_entry, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), scd->dialog_name_entry, TRUE, TRUE, 0);
        generic_dialog_attach_default(GENERIC_DIALOG(scd->dialog), scd->dialog_name_entry);
        gtk_widget_show(scd->dialog_name_entry);
 
@@ -150,7 +150,7 @@ static GtkWidget *shortcuts_new(LayoutWindow *lw)
                        G_CALLBACK(shortcuts_destroy), scd);
 
        scd->bookmarks = bookmark_list_new(SHORTCUTS, shortcuts_bookmark_select, scd);
-       gtk_box_pack_start(GTK_BOX(scd->vbox), scd->bookmarks, TRUE, TRUE, 0);
+       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);
index 6e55623..7433edb 100644 (file)
@@ -201,7 +201,7 @@ static void toolbarlist_add_button(const gchar *name, const gchar *label,
        toolbar_entry = g_new(ToolbarButtonData,1);
        toolbar_entry->button = gtk_button_new();
        gtk_button_set_relief(GTK_BUTTON(toolbar_entry->button), GTK_RELIEF_NONE);
-       gtk_box_pack_start(GTK_BOX(box), toolbar_entry->button, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(box), toolbar_entry->button, FALSE, FALSE, 0);
        gtk_widget_show(toolbar_entry->button);
 
        g_object_set_data_full(G_OBJECT(toolbar_entry->button), "toolbarbuttondata",
@@ -257,9 +257,9 @@ static void toolbarlist_add_button(const gchar *name, const gchar *label,
                toolbar_entry->image = gtk_image_new_from_icon_name(GQ_ICON_GO_JUMP,
                                                                                                                GTK_ICON_SIZE_BUTTON);
                }
-       gtk_box_pack_start(GTK_BOX(hbox), toolbar_entry->image, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), toolbar_entry->image, FALSE, FALSE, 0);
        gtk_widget_show(toolbar_entry->image);
-       gtk_box_pack_start(GTK_BOX(hbox), toolbar_entry->button_label, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), toolbar_entry->button_label, FALSE, FALSE, 0);
        gtk_widget_show(toolbar_entry->button_label);
 }
 
@@ -426,7 +426,7 @@ GtkWidget *toolbar_select_new(LayoutWindow *lw, ToolbarType bar)
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
                                                        GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
        gq_gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_NONE);
-       gtk_box_pack_start(GTK_BOX(toolbarlist[bar]->widget), scrolled, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(toolbarlist[bar]->widget), scrolled, TRUE, TRUE, 0);
        gtk_widget_show(scrolled);
 
        toolbarlist[bar]->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
@@ -437,7 +437,7 @@ GtkWidget *toolbar_select_new(LayoutWindow *lw, ToolbarType bar)
 
        add_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
        gtk_widget_show(add_box);
-       gtk_box_pack_end(GTK_BOX(toolbarlist[bar]->widget), add_box, FALSE, FALSE, 0);
+       gq_gtk_box_pack_end(GTK_BOX(toolbarlist[bar]->widget), add_box, FALSE, FALSE, 0);
        tbar = pref_toolbar_new(add_box, GTK_TOOLBAR_ICONS);
        toolbarlist[bar]->add_button = pref_toolbar_button(tbar, GQ_ICON_ADD, _("Add"), FALSE,
                                                                                        _("Add Toolbar Item"),
index 7237066..b5d0a05 100644 (file)
@@ -605,7 +605,7 @@ static void bookmark_populate(BookMarkData *bm)
 
                        b->button = gtk_button_new();
                        gtk_button_set_relief(GTK_BUTTON(b->button), GTK_RELIEF_NONE);
-                       gtk_box_pack_start(GTK_BOX(bm->box), b->button, FALSE, FALSE, 0);
+                       gq_gtk_box_pack_start(GTK_BOX(bm->box), b->button, FALSE, FALSE, 0);
                        gtk_widget_show(b->button);
 
                        g_object_set_data_full(G_OBJECT(b->button), "bookbuttondata",
@@ -661,11 +661,11 @@ static void bookmark_populate(BookMarkData *bm)
                                {
                                b->image = gtk_image_new_from_icon_name(GQ_ICON_DIRECTORY, GTK_ICON_SIZE_BUTTON);
                                }
-                       gtk_box_pack_start(GTK_BOX(box), b->image, FALSE, FALSE, 0);
+                       gq_gtk_box_pack_start(GTK_BOX(box), b->image, FALSE, FALSE, 0);
                        gtk_widget_show(b->image);
 
                        b->label = gtk_label_new(b->name);
-                       gtk_box_pack_start(GTK_BOX(box), b->label, FALSE, FALSE, 0);
+                       gq_gtk_box_pack_start(GTK_BOX(box), b->label, FALSE, FALSE, 0);
                        gtk_widget_show(b->label);
 
                        g_signal_connect(G_OBJECT(b->button), "clicked",
index fcdd69e..ca0e238 100644 (file)
@@ -1105,7 +1105,7 @@ gboolean download_web_file(const gchar *text, gboolean minimized, gpointer data)
                                generic_dialog_add_message(web->gd, GQ_ICON_DIALOG_INFO, message, nullptr, FALSE);
 
                                web->progress = gtk_progress_bar_new();
-                               gtk_box_pack_start(GTK_BOX(web->gd->vbox), web->progress, FALSE, FALSE, 0);
+                               gq_gtk_box_pack_start(GTK_BOX(web->gd->vbox), web->progress, FALSE, FALSE, 0);
                                gtk_widget_show(web->progress);
                                if (minimized)
                                        {
index 9d9ddee..7a6db57 100644 (file)
@@ -218,14 +218,14 @@ GtkWidget *help_window_new(const gchar *title,
        /* text window */
 
        hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-       gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
        gtk_widget_show(hbox);
 
        scrolled = gq_gtk_scrolled_window_new(nullptr, nullptr);
        gq_gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
                                       GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-       gtk_box_pack_start(GTK_BOX(hbox), scrolled, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), scrolled, TRUE, TRUE, 0);
        gtk_widget_show(scrolled);
 
        text = gtk_text_view_new();
@@ -240,7 +240,7 @@ GtkWidget *help_window_new(const gchar *title,
        hbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
        gtk_container_set_border_width(GTK_CONTAINER(hbox), PREF_PAD_BORDER);
        gtk_button_box_set_layout(GTK_BUTTON_BOX(hbox), GTK_BUTTONBOX_END);
-       gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+       gq_gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
        gtk_widget_show(hbox);
 
        button = gtk_button_new_from_icon_name(GQ_ICON_CLOSE, GTK_ICON_SIZE_BUTTON);
index d228469..29a69b7 100644 (file)
@@ -50,7 +50,7 @@ GtkWidget *pref_box_new(GtkWidget *parent_box, gboolean fill,
                box = gtk_box_new(GTK_ORIENTATION_VERTICAL, padding);
                }
 
-       gtk_box_pack_start(GTK_BOX(parent_box), box, fill, fill, 0);
+       gq_gtk_box_pack_start(GTK_BOX(parent_box), box, fill, fill, 0);
        gtk_widget_show(box);
 
        return box;
@@ -77,7 +77,7 @@ GtkWidget *pref_group_new(GtkWidget *parent_box, gboolean fill,
                g_list_free(list);
                }
 
-       gtk_box_pack_start(GTK_BOX(parent_box), vbox, fill, fill, 0);
+       gq_gtk_box_pack_start(GTK_BOX(parent_box), vbox, fill, fill, 0);
        gtk_widget_show(vbox);
 
        label = gtk_label_new(text);
@@ -85,11 +85,11 @@ GtkWidget *pref_group_new(GtkWidget *parent_box, gboolean fill,
        gtk_label_set_yalign(GTK_LABEL(label), 0.5);
        pref_label_bold(label, TRUE, FALSE);
 
-       gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
        gtk_widget_show(label);
 
        hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_INDENT);
-       gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
        gtk_widget_show(hbox);
 
        /* indent using empty box */
@@ -103,7 +103,7 @@ GtkWidget *pref_group_new(GtkWidget *parent_box, gboolean fill,
                {
                box = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
                }
-       gtk_box_pack_start(GTK_BOX(hbox), box, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), box, TRUE, TRUE, 0);
        gtk_widget_show(box);
 
        g_object_set_data(G_OBJECT(box), "pref_group", vbox);
@@ -137,7 +137,7 @@ GtkWidget *pref_frame_new(GtkWidget *parent_box, gboolean fill,
        GtkWidget *frame = nullptr;
 
        frame = gtk_frame_new(text);
-       gtk_box_pack_start(GTK_BOX(parent_box), frame, fill, fill, 0);
+       gq_gtk_box_pack_start(GTK_BOX(parent_box), frame, fill, fill, 0);
        gtk_widget_show(frame);
 
        if (orientation == GTK_ORIENTATION_HORIZONTAL)
@@ -160,7 +160,7 @@ GtkWidget *pref_spacer(GtkWidget *parent_box, gboolean padding)
        GtkWidget *spacer;
 
        spacer = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-       gtk_box_pack_start(GTK_BOX(parent_box), spacer, FALSE, FALSE, padding / 2);
+       gq_gtk_box_pack_start(GTK_BOX(parent_box), spacer, FALSE, FALSE, padding / 2);
        gtk_widget_show(spacer);
 
        return spacer;
@@ -171,7 +171,7 @@ GtkWidget *pref_line(GtkWidget *parent_box, gboolean padding)
        GtkWidget *spacer;
 
        spacer = gtk_separator_new(GTK_IS_HBOX(parent_box) ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL);
-       gtk_box_pack_start(GTK_BOX(parent_box), spacer, FALSE, FALSE, padding / 2);
+       gq_gtk_box_pack_start(GTK_BOX(parent_box), spacer, FALSE, FALSE, padding / 2);
        gtk_widget_show(spacer);
 
        return spacer;
@@ -182,7 +182,7 @@ GtkWidget *pref_label_new(GtkWidget *parent_box, const gchar *text)
        GtkWidget *label;
 
        label = gtk_label_new(text);
-       gtk_box_pack_start(GTK_BOX(parent_box), label, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(parent_box), label, FALSE, FALSE, 0);
        gtk_widget_show(label);
 
        return label;
@@ -194,7 +194,7 @@ GtkWidget *pref_label_new_mnemonic(GtkWidget *parent_box, const gchar *text, Gtk
 
        label = gtk_label_new_with_mnemonic(text);
        gtk_label_set_mnemonic_widget(GTK_LABEL(label), widget);
-       gtk_box_pack_start(GTK_BOX(parent_box), label, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(parent_box), label, FALSE, FALSE, 0);
        gtk_widget_show(label);
 
        return label;
@@ -253,7 +253,7 @@ GtkWidget *pref_button_new(GtkWidget *parent_box, const gchar *icon_name,
 
        if (parent_box)
                {
-               gtk_box_pack_start(GTK_BOX(parent_box), button, FALSE, FALSE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(parent_box), button, FALSE, FALSE, 0);
                gtk_widget_show(button);
                }
 
@@ -276,7 +276,7 @@ static GtkWidget *real_pref_checkbox_new(GtkWidget *parent_box, const gchar *tex
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), active);
        if (func) g_signal_connect(G_OBJECT(button), "clicked", func, data);
 
-       gtk_box_pack_start(GTK_BOX(parent_box), button, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(parent_box), button, FALSE, FALSE, 0);
        gtk_widget_show(button);
 
        return button;
@@ -377,7 +377,7 @@ static GtkWidget *real_pref_radiobutton_new(GtkWidget *parent_box, GtkWidget *si
        if (active) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), active);
        if (func) g_signal_connect(G_OBJECT(button), "clicked", func, data);
 
-       gtk_box_pack_start(GTK_BOX(parent_box), button, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(parent_box), button, FALSE, FALSE, 0);
        gtk_widget_show(button);
 
        return button;
@@ -461,7 +461,7 @@ static GtkWidget *real_pref_spin_new(GtkWidget *parent_box, const gchar *text, c
                pref_link_sensitivity(label, spin);
                }
 
-       gtk_box_pack_start(GTK_BOX(box), spin, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(box), spin, FALSE, FALSE, 0);
        gtk_widget_show(spin);
 
        /* perhaps this should only be PREF_PAD_GAP distance from spinbutton ? */
@@ -548,7 +548,7 @@ GtkWidget *pref_table_new(GtkWidget *parent_box, gint columns, gint rows,
 
        if (parent_box)
                {
-               gtk_box_pack_start(GTK_BOX(parent_box), table, fill, fill, 0);
+               gq_gtk_box_pack_start(GTK_BOX(parent_box), table, fill, fill, 0);
                gtk_widget_show(table);
                }
 
@@ -644,7 +644,7 @@ GtkWidget *pref_table_spin(GtkWidget *table, gint column, gint row,
        if (suffix)
                {
                box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
-               gtk_box_pack_start(GTK_BOX(box), spin, FALSE, FALSE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(box), spin, FALSE, FALSE, 0);
                gtk_widget_show(spin);
 
                label = pref_label_new(box, suffix);
@@ -685,7 +685,7 @@ GtkWidget *pref_toolbar_new(GtkWidget *parent_box, GtkToolbarStyle style)
 
        if (parent_box)
                {
-               gtk_box_pack_start(GTK_BOX(parent_box), tbar, FALSE, FALSE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(parent_box), tbar, FALSE, FALSE, 0);
                gtk_widget_show(tbar);
                }
        return tbar;
@@ -1038,7 +1038,7 @@ GtkWidget *date_selection_new()
        gtk_container_add(GTK_CONTAINER(ds->button), icon);
        gtk_widget_show(icon);
 
-       gtk_box_pack_start(GTK_BOX(ds->box), ds->button, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(ds->box), ds->button, FALSE, FALSE, 0);
        g_signal_connect(G_OBJECT(ds->button), "clicked",
                         G_CALLBACK(date_selection_button_cb), ds);
        gtk_widget_show(ds->button);
@@ -1308,10 +1308,10 @@ GtkWidget *pref_color_button_new(GtkWidget *parent_box,
                label = gtk_label_new(title);
 
                hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-               gtk_box_pack_start(GTK_BOX(parent_box), hbox, TRUE, TRUE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(parent_box), hbox, TRUE, TRUE, 0);
 
-               gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
-               gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0);
 
                gtk_widget_show_all(hbox);
                }
index 785fb17..03ea7c1 100644 (file)
@@ -1023,7 +1023,7 @@ GtkWidget *path_selection_new_with_files(GtkWidget *entry, const gchar *path,
        dd->hidden_button = gtk_check_button_new_with_label(_("Show hidden"));
        g_signal_connect(G_OBJECT(dd->hidden_button), "clicked",
                         G_CALLBACK(dest_show_hidden_cb), dd);
-       gtk_box_pack_end(GTK_BOX(hbox2), dd->hidden_button, FALSE, FALSE, 0);
+       gq_gtk_box_pack_end(GTK_BOX(hbox2), dd->hidden_button, FALSE, FALSE, 0);
        gtk_widget_show(dd->hidden_button);
 
        hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP);
@@ -1046,7 +1046,7 @@ GtkWidget *path_selection_new_with_files(GtkWidget *entry, const gchar *path,
 
        /* bookmarks */
        scrolled = bookmark_list_new(nullptr, dest_bookmark_select_cb, dd);
-       gtk_box_pack_start(GTK_BOX(hbox2), scrolled, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox2), scrolled, FALSE, FALSE, 0);
        gtk_widget_show(scrolled);
 
        dd->bookmark_list = scrolled;
@@ -1055,7 +1055,7 @@ GtkWidget *path_selection_new_with_files(GtkWidget *entry, const gchar *path,
        gq_gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
                                       GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
-       gtk_box_pack_start(GTK_BOX(hbox2), scrolled, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox2), scrolled, TRUE, TRUE, 0);
        gtk_widget_show(scrolled);
 
        store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_STRING);
@@ -1119,7 +1119,7 @@ GtkWidget *path_selection_new_with_files(GtkWidget *entry, const gchar *path,
                gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(dd->filter_combo), renderer, TRUE);
                gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(dd->filter_combo), renderer,
                                               "text", FILTER_COLUMN_NAME, NULL);
-               gtk_box_pack_start(GTK_BOX(hbox2), dd->filter_combo, TRUE, TRUE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(hbox2), dd->filter_combo, TRUE, TRUE, 0);
                gtk_widget_show(dd->filter_combo);
 
                scrolled = gq_gtk_scrolled_window_new(nullptr, nullptr);
index 5c470bc..7ab3501 100644 (file)
@@ -629,13 +629,13 @@ GtkWidget *tab_completion_new_with_history(GtkWidget **entry, const gchar *text,
        box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
 
        combo = gtk_combo_box_text_new_with_entry();
-       gtk_box_pack_start(GTK_BOX(box), combo, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(box), combo, TRUE, TRUE, 0);
        gtk_widget_show(combo);
 
        combo_entry = gtk_bin_get_child(GTK_BIN(combo));
 
        button = tab_completion_create_complete_button(combo_entry, combo);
-       gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE, 0);
        gtk_widget_show(button);
 
        tab_completion_add_to_entry(combo_entry, enter_func, nullptr, nullptr, data);
@@ -731,11 +731,11 @@ GtkWidget *tab_completion_new(GtkWidget **entry, const gchar *text,
 
        newentry = gtk_entry_new();
        if (text) gtk_entry_set_text(GTK_ENTRY(newentry), text);
-       gtk_box_pack_start(GTK_BOX(hbox), newentry, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), newentry, TRUE, TRUE, 0);
        gtk_widget_show(newentry);
 
        button = tab_completion_create_complete_button(newentry, newentry);
-       gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
        gtk_widget_show(button);
 
        tab_completion_add_to_entry(newentry, enter_func, filter, filter_desc, data);
@@ -906,7 +906,7 @@ void tab_completion_add_select_button(GtkWidget *entry, const gchar *title, gboo
        g_signal_connect(G_OBJECT(td->fd_button), "clicked",
                         G_CALLBACK(tab_completion_select_pressed), td);
 
-       gtk_box_pack_start(GTK_BOX(hbox), td->fd_button, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), td->fd_button, FALSE, FALSE, 0);
 
        gtk_widget_show(td->fd_button);
 }
index f66924c..1aad03c 100644 (file)
@@ -269,7 +269,7 @@ GtkWidget *generic_dialog_add_button(GenericDialog *gd, const gchar *icon_name,
  * @param icon_stock_id
  * @param heading
  * @param text
- * @param expand Used as the "expand" and "fill" parameters in the eventual call to gtk_box_pack_start()
+ * @param expand Used as the "expand" and "fill" parameters in the eventual call to gq_gtk_box_pack_start()
  * @returns
  *
  *
@@ -289,7 +289,7 @@ GtkWidget *generic_dialog_add_message(GenericDialog *gd, const gchar *icon_name,
                image = gtk_image_new_from_icon_name(icon_name, GTK_ICON_SIZE_DIALOG);
                gtk_widget_set_halign(GTK_WIDGET(image), GTK_ALIGN_CENTER);
                gtk_widget_set_valign(GTK_WIDGET(image), GTK_ALIGN_START);
-               gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0);
                gtk_widget_show(image);
                }
 
@@ -442,13 +442,13 @@ static void generic_dialog_setup(GenericDialog *gd,
        gtk_widget_show(vbox);
 
        gd->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
-       gtk_box_pack_start(GTK_BOX(vbox), gd->vbox, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(vbox), gd->vbox, TRUE, TRUE, 0);
        gtk_widget_show(gd->vbox);
 
        gd->hbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
        gtk_button_box_set_layout(GTK_BUTTON_BOX(gd->hbox), GTK_BUTTONBOX_END);
        gtk_box_set_spacing(GTK_BOX(gd->hbox), PREF_PAD_BUTTON_GAP);
-       gtk_box_pack_start(GTK_BOX(vbox), gd->hbox, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(vbox), gd->hbox, FALSE, FALSE, 0);
        gtk_widget_show(gd->hbox);
 
        if (gd->cancel_cb)
@@ -714,7 +714,7 @@ void file_dialog_add_path_widgets(FileDialog *fdlg, const gchar *default_path, c
 
        tabcomp = tab_completion_new_with_history(&fdlg->entry, nullptr,
                  history_key, -1, file_dialog_entry_enter_cb, fdlg);
-       gtk_box_pack_end(GTK_BOX(GENERIC_DIALOG(fdlg)->vbox), tabcomp, FALSE, FALSE, 0);
+       gq_gtk_box_pack_end(GTK_BOX(GENERIC_DIALOG(fdlg)->vbox), tabcomp, FALSE, FALSE, 0);
        generic_dialog_attach_default(GENERIC_DIALOG(fdlg), fdlg->entry);
        gtk_widget_show(tabcomp);
 
@@ -743,7 +743,7 @@ void file_dialog_add_path_widgets(FileDialog *fdlg, const gchar *default_path, c
 
        list = path_selection_new_with_files(fdlg->entry, fdlg->dest_path, filter, filter_desc);
        path_selection_add_select_func(fdlg->entry, file_dialog_entry_enter_cb, fdlg);
-       gtk_box_pack_end(GTK_BOX(GENERIC_DIALOG(fdlg)->vbox), list, TRUE, TRUE, 0);
+       gq_gtk_box_pack_end(GTK_BOX(GENERIC_DIALOG(fdlg)->vbox), list, TRUE, TRUE, 0);
        gtk_widget_show(list);
 
        gtk_widget_grab_focus(fdlg->entry);
index ce00bba..0c389b3 100644 (file)
@@ -95,15 +95,15 @@ static void generic_dialog_add_image(GenericDialog *gd, GtkWidget *box,
                {
                GtkWidget *sep;
 
-               gtk_box_pack_start(GTK_BOX(preview_box), vbox, FALSE, TRUE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(preview_box), vbox, FALSE, TRUE, 0);
 
                sep = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL);
-               gtk_box_pack_start(GTK_BOX(preview_box), sep, FALSE, FALSE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(preview_box), sep, FALSE, FALSE, 0);
                gtk_widget_show(sep);
                }
        else
                {
-               gtk_box_pack_start(GTK_BOX(box), vbox, FALSE, TRUE, PREF_PAD_GAP);
+               gq_gtk_box_pack_start(GTK_BOX(box), vbox, FALSE, TRUE, PREF_PAD_GAP);
                }
        gtk_widget_show(vbox);
 
@@ -120,7 +120,7 @@ static void generic_dialog_add_image(GenericDialog *gd, GtkWidget *box,
        imd = image_new(FALSE);
        g_object_set(G_OBJECT(imd->pr), "zoom_expand", FALSE, NULL);
        gtk_widget_set_size_request(imd->widget, DIALOG_DEF_IMAGE_DIM_X, DIALOG_DEF_IMAGE_DIM_Y);
-       gtk_box_pack_start(GTK_BOX(vbox), imd->widget, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(vbox), imd->widget, TRUE, TRUE, 0);
        image_change_fd(imd, fd1, 0.0);
        gtk_widget_show(imd->widget);
 
@@ -153,7 +153,7 @@ static void generic_dialog_add_image(GenericDialog *gd, GtkWidget *box,
                imd = image_new(FALSE);
                g_object_set(G_OBJECT(imd->pr), "zoom_expand", FALSE, NULL);
                gtk_widget_set_size_request(imd->widget, DIALOG_DEF_IMAGE_DIM_X, DIALOG_DEF_IMAGE_DIM_Y);
-               gtk_box_pack_start(GTK_BOX(vbox), imd->widget, TRUE, TRUE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(vbox), imd->widget, TRUE, TRUE, 0);
                if (fd2) image_change_fd(imd, fd2, 0.0);
                gtk_widget_show(imd->widget);
 
@@ -519,7 +519,7 @@ static GtkWidget *file_util_dialog_add_list(GtkWidget *box, GList *list, gboolea
        gq_gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
                                       GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-       gtk_box_pack_start(GTK_BOX(box), scrolled, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(box), scrolled, TRUE, TRUE, 0);
        gtk_widget_show(scrolled);
 
        store = gtk_list_store_new(UTILITY_COLUMN_COUNT, G_TYPE_POINTER, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
@@ -1659,11 +1659,11 @@ static GtkWidget *furm_simple_vlabel(GtkWidget *box, const gchar *text, gboolean
        GtkWidget *label;
 
        vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
-       gtk_box_pack_start(GTK_BOX(box), vbox, expand, expand, 0);
+       gq_gtk_box_pack_start(GTK_BOX(box), vbox, expand, expand, 0);
        gtk_widget_show(vbox);
 
        label = gtk_label_new(text);
-       gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
        gtk_widget_show(label);
 
        return vbox;
@@ -1734,7 +1734,7 @@ static void file_util_dialog_init_source_dest(UtilityData *ud, gboolean second_i
 
        ud->notebook = gtk_notebook_new();
 
-       gtk_box_pack_start(GTK_BOX(ud->gd->vbox), ud->notebook, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(ud->gd->vbox), ud->notebook, FALSE, FALSE, 0);
        gtk_widget_show(ud->notebook);
 
 
@@ -1771,7 +1771,7 @@ static void file_util_dialog_init_source_dest(UtilityData *ud, gboolean second_i
        combo = history_combo_new(&ud->auto_entry_front, "", "numerical_rename_prefix", -1);
        g_signal_connect(G_OBJECT(ud->auto_entry_front), "changed",
                         G_CALLBACK(file_util_rename_preview_entry_cb), ud);
-       gtk_box_pack_start(GTK_BOX(box2), combo, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(box2), combo, TRUE, TRUE, 0);
        gtk_widget_show(combo);
 
        box2 = furm_simple_vlabel(hbox, _("Start #"), FALSE);
@@ -1785,7 +1785,7 @@ static void file_util_dialog_init_source_dest(UtilityData *ud, gboolean second_i
        combo = history_combo_new(&ud->auto_entry_end, options->cp_mv_rn.auto_end, "numerical_rename_suffix", -1);
        g_signal_connect(G_OBJECT(ud->auto_entry_end), "changed",
                         G_CALLBACK(file_util_rename_preview_entry_cb), ud);
-       gtk_box_pack_start(GTK_BOX(box2), combo, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(box2), combo, TRUE, TRUE, 0);
        gtk_widget_show(combo);
 
        ud->auto_spin_pad = pref_spin_new(page, _("Padding:"), nullptr,
@@ -1803,7 +1803,7 @@ static void file_util_dialog_init_source_dest(UtilityData *ud, gboolean second_i
        combo = history_combo_new(&ud->format_entry, "", "auto_rename_format", -1);
        g_signal_connect(G_OBJECT(ud->format_entry), "changed",
                         G_CALLBACK(file_util_rename_preview_entry_cb), ud);
-       gtk_box_pack_start(GTK_BOX(box2), combo, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(box2), combo, TRUE, TRUE, 0);
        gtk_widget_show(combo);
 
        box2 = furm_simple_vlabel(hbox, _("Start #"), FALSE);
@@ -3337,19 +3337,19 @@ gchar *new_folder(GtkWindow *window , gchar *path)
 
        content_area = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
        vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
-       gtk_box_pack_start(GTK_BOX(content_area), vbox, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(content_area), vbox, FALSE, FALSE, 0);
 
        hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP);
        gtk_container_set_border_width(GTK_CONTAINER(hbox), PREF_PAD_GAP);
-       gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
        image = gtk_image_new_from_icon_name(GQ_ICON_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG);
-       gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0);
        label = gtk_label_new(_("Create new folder"));
-       gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 
        folder_name_entry = gtk_entry_new();
        gtk_entry_set_text(GTK_ENTRY(folder_name_entry), folder_name);
-       gtk_box_pack_start(GTK_BOX(vbox), folder_name_entry, FALSE, FALSE, PREF_PAD_SPACE);
+       gq_gtk_box_pack_start(GTK_BOX(vbox), folder_name_entry, FALSE, FALSE, PREF_PAD_SPACE);
        g_signal_connect(G_OBJECT(folder_name_entry), "activate", G_CALLBACK(new_folder_entry_activate_cb), dialog);
 
        gtk_widget_show_all(dialog);
index 8624c11..a40a58c 100644 (file)
@@ -1025,7 +1025,7 @@ static GtkWidget *vf_marks_filter_init(ViewFile *vf)
        for (i = 0; i < FILEDATA_MARKS_SIZE ; i++)
                {
                GtkWidget *check = gtk_check_button_new();
-               gtk_box_pack_start(GTK_BOX(hbox), check, FALSE, FALSE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(hbox), check, FALSE, FALSE, 0);
                g_signal_connect(G_OBJECT(check), "toggled",
                         G_CALLBACK(vf_marks_filter_toggle_cb), vf);
                g_signal_connect(G_OBJECT(check), "button_press_event",
@@ -1207,27 +1207,27 @@ static GtkWidget *vf_file_filter_init(ViewFile *vf)
        g_signal_connect(G_OBJECT(combo_entry), "button_press_event",
                         G_CALLBACK(vf_file_filter_press_cb), vf);
 
-       gtk_box_pack_start(GTK_BOX(hbox), vf->file_filter.combo, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), vf->file_filter.combo, FALSE, FALSE, 0);
        gtk_widget_show(vf->file_filter.combo);
        gtk_container_add(GTK_CONTAINER(frame), hbox);
        gtk_widget_show(hbox);
 
        case_sensitive = gtk_check_button_new_with_label(_("Case"));
-       gtk_box_pack_start(GTK_BOX(hbox), case_sensitive, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), case_sensitive, FALSE, FALSE, 0);
        gtk_widget_set_tooltip_text(GTK_WIDGET(case_sensitive), _("Case sensitive"));
        g_signal_connect(G_OBJECT(case_sensitive), "clicked", G_CALLBACK(case_sensitive_cb), vf);
        gtk_widget_show(case_sensitive);
 
        menubar = gtk_menu_bar_new();
-       gtk_box_pack_start(GTK_BOX(hbox), menubar, FALSE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), menubar, FALSE, TRUE, 0);
        gtk_widget_show(menubar);
 
        box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP);
        icon = gtk_image_new_from_icon_name(GQ_ICON_PAN_DOWN, GTK_ICON_SIZE_MENU);
        label = gtk_label_new(_("Class"));
 
-       gtk_box_pack_start(GTK_BOX(box), label, FALSE, FALSE, 0);
-       gtk_box_pack_end(GTK_BOX(box), icon, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(box), label, FALSE, FALSE, 0);
+       gq_gtk_box_pack_end(GTK_BOX(box), icon, FALSE, FALSE, 0);
 
        menuitem = gtk_menu_item_new();
 
@@ -1267,9 +1267,9 @@ ViewFile *vf_new(FileViewType type, FileData *dir_fd)
        vf->file_filter.frame = vf_file_filter_init(vf);
 
        vf->widget = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
-       gtk_box_pack_start(GTK_BOX(vf->widget), vf->filter, FALSE, FALSE, 0);
-       gtk_box_pack_start(GTK_BOX(vf->widget), vf->file_filter.frame, FALSE, FALSE, 0);
-       gtk_box_pack_start(GTK_BOX(vf->widget), vf->scrolled, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(vf->widget), vf->filter, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(vf->widget), vf->file_filter.frame, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(vf->widget), vf->scrolled, TRUE, TRUE, 0);
        gtk_widget_show(vf->scrolled);
 
        g_signal_connect(G_OBJECT(vf->widget), "destroy",