GTK4: gtk_scrolled_window

GTK4 migration
- gtk_scrolled_window_new() takes no parameters
- gtk_scrolled_window_set_shadow_type() replaced by
gtk_scrolled_window_set_has_frame()

diff --git a/src/advanced-exif.cc b/src/advanced-exif.cc
index 92542eb..a67c90d 100644 (file)
--- a/src/advanced-exif.cc
+++ b/src/advanced-exif.cc
@@ -506,8 +506,8 @@ GtkWidget *advanced_exif_new(LayoutWindow *lw)
        g_signal_connect(G_OBJECT(ew->listview), "button_release_event",
                        G_CALLBACK(advanced_exif_mouseclick), ew);
 
-       ew->scrolled = gtk_scrolled_window_new(nullptr, nullptr);
-       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(ew->scrolled), GTK_SHADOW_IN);
+       ew->scrolled = gq_gtk_scrolled_window_new(nullptr, nullptr);
+       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);

diff --git a/src/bar-comment.cc b/src/bar-comment.cc
index 219f5a9..9572643 100644 (file)
--- a/src/bar-comment.cc
+++ b/src/bar-comment.cc
@@ -278,14 +278,14 @@ static GtkWidget *bar_pane_comment_new(const gchar *id, const gchar *title, cons
        pcd->key = g_strdup(key);
        pcd->height = height;
 
-       scrolled = gtk_scrolled_window_new(nullptr, nullptr);
+       scrolled = gq_gtk_scrolled_window_new(nullptr, nullptr);
 
        pcd->widget = scrolled;
        g_object_set_data(G_OBJECT(pcd->widget), "pane_data", pcd);
        g_signal_connect(G_OBJECT(pcd->widget), "destroy",
                         G_CALLBACK(bar_pane_comment_destroy), pcd);
 
-       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
+       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);
 

diff --git a/src/bar-keywords.cc b/src/bar-keywords.cc
index 21652ab..5b98b0c 100644 (file)
--- a/src/bar-keywords.cc
+++ b/src/bar-keywords.cc
@@ -1488,8 +1488,8 @@ static GtkWidget *bar_pane_keywords_new(const gchar *id, const gchar *title, con
        gtk_widget_set_size_request(pkd->widget, -1, height);
        gtk_widget_show(hbox);
 
-       scrolled = gtk_scrolled_window_new(nullptr, nullptr);
-       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
+       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);
@@ -1507,8 +1507,8 @@ static GtkWidget *bar_pane_keywords_new(const gchar *id, const gchar *title, con
 
        if (options->show_predefined_keyword_tree)
                {
-               scrolled = gtk_scrolled_window_new(nullptr, nullptr);
-               gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
+               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);

diff --git a/src/bar.cc b/src/bar.cc
index d1d6a38..a52e9f0 100644 (file)
--- a/src/bar.cc
+++ b/src/bar.cc
@@ -768,7 +768,7 @@ GtkWidget *bar_new(LayoutWindow *lw)
        gtk_box_pack_start(GTK_BOX(bd->widget), box, FALSE, FALSE, 0);
        gtk_widget_show(box);
 
-       scrolled = gtk_scrolled_window_new(nullptr, nullptr);
+       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);
@@ -792,7 +792,7 @@ GtkWidget *bar_new(LayoutWindow *lw)
        g_signal_connect(G_OBJECT(gtk_bin_get_child(GTK_BIN(scrolled))), "unrealize", G_CALLBACK(bar_unrealize_clutter_fix_cb), NULL);
 #endif
 
-       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_NONE);
+       gq_gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_NONE);
        gtk_widget_show(bd->vbox);
        return bd->widget;
 }

diff --git a/src/collect-dlg.cc b/src/collect-dlg.cc
index ab8ebf8..26db0c7 100644 (file)
--- a/src/collect-dlg.cc
+++ b/src/collect-dlg.cc
@@ -161,7 +161,7 @@ static void collection_save_or_append_dialog(gint type, CollectionData *cd)
                existing_collections = gtk_label_new(out_string->str);
                g_string_free(out_string, TRUE);
 
-               scrolled = gtk_scrolled_window_new(nullptr, nullptr);
+               scrolled = gq_gtk_scrolled_window_new(nullptr, nullptr);
                gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
                gtk_widget_show(scrolled);
 

diff --git a/src/collect-table.cc b/src/collect-table.cc
index bed7239..a3ef739 100644 (file)
--- a/src/collect-table.cc
+++ b/src/collect-table.cc
@@ -2661,8 +2661,8 @@ CollectTable *collection_table_new(CollectionData *cd)
        ct->show_text = options->show_icon_names;
        ct->show_stars = options->show_star_rating;
 
-       ct->scrolled = gtk_scrolled_window_new(nullptr, nullptr);
-       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(ct->scrolled), GTK_SHADOW_IN);
+       ct->scrolled = gq_gtk_scrolled_window_new(nullptr, nullptr);
+       gq_gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(ct->scrolled), GTK_SHADOW_IN);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(ct->scrolled),
                                       GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 

diff --git a/src/compat.h b/src/compat.h
index b914f67..55824e5 100644 (file)
--- a/src/compat.h
+++ b/src/compat.h
@@ -29,5 +29,13 @@
 #define        MAP_ANON        MAP_ANONYMOUS
 #endif
 
+#ifdef HAVE_GTK4
+       #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_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
+
 #endif /* COMPAT_H */
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */

diff --git a/src/desktop-file.cc b/src/desktop-file.cc
index 00481de..bf37d94 100644 (file)
--- a/src/desktop-file.cc
+++ b/src/desktop-file.cc
@@ -238,8 +238,8 @@ static void editor_window_new(const gchar *src_path, const gchar *desktop_name)
                }
 
 
-       scrolled = gtk_scrolled_window_new(nullptr, nullptr);
-       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
+       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(win_vbox), scrolled, TRUE, TRUE, 5);
@@ -593,8 +593,8 @@ static void editor_list_window_create()
        gtk_widget_set_can_default(button, TRUE);
        gtk_widget_show(button);
 
-       scrolled = gtk_scrolled_window_new(nullptr, nullptr);
-       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
+       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(win_vbox), scrolled, TRUE, TRUE, 5);

diff --git a/src/dupe.cc b/src/dupe.cc
index ff135f4..4374a8a 100644 (file)
--- a/src/dupe.cc
+++ b/src/dupe.cc
@@ -4633,8 +4633,8 @@ DupeWindow *dupe_window_new()
        gtk_box_pack_start(GTK_BOX(vbox), dw->table, TRUE, TRUE, 0);
        gtk_widget_show(dw->table);
 
-       scrolled = gtk_scrolled_window_new(nullptr, nullptr);
-       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
+       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_table_attach_defaults(GTK_TABLE(dw->table), scrolled, 0, 2, 0, 1);
        gtk_widget_show(scrolled);
@@ -4690,8 +4690,8 @@ DupeWindow *dupe_window_new()
                gtk_table_set_col_spacings(GTK_TABLE(dw->table), 0);
                }
 
-       scrolled = gtk_scrolled_window_new(nullptr, nullptr);
-       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
+       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);
        gtk_widget_show(scrolled);

diff --git a/src/editors.cc b/src/editors.cc
index ec246fc..c698bbd 100644 (file)
--- a/src/editors.cc
+++ b/src/editors.cc
@@ -594,8 +594,8 @@ static EditorVerboseData *editor_verbose_window(EditorData *ed, const gchar *tex
                                                    editor_verbose_window_close, TRUE);
        gtk_widget_set_sensitive(vd->button_close, FALSE);
 
-       scrolled = gtk_scrolled_window_new(nullptr, nullptr);
-       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
+       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(vd->gd->vbox), scrolled, TRUE, TRUE, 5);

diff --git a/src/layout-config.cc b/src/layout-config.cc
index c2b7b12..01234e9 100644 (file)
--- a/src/layout-config.cc
+++ b/src/layout-config.cc
@@ -311,8 +311,8 @@ GtkWidget *layout_config_new()
                }
        gtk_widget_show(hbox);
 
-       scrolled = gtk_scrolled_window_new(nullptr, nullptr);
-       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
+       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_NEVER, GTK_POLICY_NEVER);
        gtk_box_pack_start(GTK_BOX(lc->box), scrolled, FALSE, FALSE, 0);

diff --git a/src/layout.cc b/src/layout.cc
index 8ce8a19..eb156ea 100644 (file)
--- a/src/layout.cc
+++ b/src/layout.cc
@@ -335,7 +335,7 @@ static GtkWidget *layout_tool_setup(LayoutWindow *lw)
                menu_bar = layout_actions_menu_bar(lw);
 
                toolbar = layout_actions_toolbar(lw, TOOLBAR_MAIN);
-               scroll_window = gtk_scrolled_window_new(nullptr, nullptr);
+               scroll_window = gq_gtk_scrolled_window_new(nullptr, nullptr);
                gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll_window), GTK_POLICY_AUTOMATIC,GTK_POLICY_NEVER);
                gtk_container_add(GTK_CONTAINER(scroll_window), menu_bar);
 

diff --git a/src/logwindow.cc b/src/logwindow.cc
index 8a63bc4..6609641 100644 (file)
--- a/src/logwindow.cc
+++ b/src/logwindow.cc
@@ -420,10 +420,10 @@ static LogWindow *log_window_create(LayoutWindow *lw)
                         G_CALLBACK(hide_cb), logwin);
        gtk_widget_realize(window);
 
-       scrolledwin = gtk_scrolled_window_new(nullptr, nullptr);
+       scrolledwin = gq_gtk_scrolled_window_new(nullptr, nullptr);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
                                       GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
-       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwin),
+       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);

diff --git a/src/osd.cc b/src/osd.cc
index 6adb7ed..8f0c82f 100644 (file)
--- a/src/osd.cc
+++ b/src/osd.cc
@@ -163,7 +163,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 = gtk_scrolled_window_new(nullptr, nullptr);
+       scrolled = gq_gtk_scrolled_window_new(nullptr, nullptr);
        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),

diff --git a/src/preferences.cc b/src/preferences.cc
index d89a8d6..83ae3c5 100644 (file)
--- a/src/preferences.cc
+++ b/src/preferences.cc
@@ -1709,7 +1709,7 @@ static GtkWidget *scrolled_notebook_page(GtkWidget *notebook, const gchar *title
        GtkWidget *scrolled;
        GtkWidget *viewport;
 
-       scrolled = gtk_scrolled_window_new(nullptr, nullptr);
+       scrolled = gq_gtk_scrolled_window_new(nullptr, nullptr);
        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);
@@ -2405,9 +2405,9 @@ static void config_tab_osd(GtkWidget *notebook)
 
        pref_label_new(group, _("Image overlay template"));
 
-       scrolled = gtk_scrolled_window_new(nullptr, nullptr);
+       scrolled = gq_gtk_scrolled_window_new(nullptr, nullptr);
        gtk_widget_set_size_request(scrolled, 200, 150);
-       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
+       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);
@@ -2626,8 +2626,8 @@ static void config_tab_files(GtkWidget *notebook)
                         G_CALLBACK(filter_disable_cb), frame);
        gtk_widget_set_sensitive(frame, !options->file_filter.disable);
 
-       scrolled = gtk_scrolled_window_new(nullptr, nullptr);
-       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
+       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);
        gtk_widget_show(scrolled);
@@ -3199,7 +3199,7 @@ static void config_tab_keywords(GtkWidget *notebook)
 
        keyword_text = gtk_text_view_new();
        gtk_widget_set_size_request(keyword_text, 20, 20);
-       scrolled = gtk_scrolled_window_new(nullptr, nullptr);
+       scrolled = gq_gtk_scrolled_window_new(nullptr, nullptr);
        gtk_box_pack_start(GTK_BOX(group), scrolled, TRUE, TRUE, 0);
        gtk_widget_show(scrolled);
 
@@ -3633,8 +3633,8 @@ static void config_tab_accelerators(GtkWidget *notebook)
 
        group = pref_group_new(vbox, TRUE, _("Accelerators"), GTK_ORIENTATION_VERTICAL);
 
-       scrolled = gtk_scrolled_window_new(nullptr, nullptr);
-       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
+       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);
        gtk_widget_show(scrolled);

diff --git a/src/print.cc b/src/print.cc
index 2bae222..68828b3 100644 (file)
--- a/src/print.cc
+++ b/src/print.cc
@@ -380,9 +380,9 @@ static void print_text_menu(GtkWidget *box, PrintWindow *pw)
        gtk_widget_set_tooltip_markup(image_text_template_view,
                                        _("Extensive formatting options are shown in the Help file"));
 
-       scrolled = gtk_scrolled_window_new(nullptr, nullptr);
+       scrolled = gq_gtk_scrolled_window_new(nullptr, nullptr);
        gtk_widget_set_size_request(scrolled, 200, 50);
-       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
+       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);
@@ -433,9 +433,9 @@ static void print_text_menu(GtkWidget *box, PrintWindow *pw)
        gtk_widget_show(hbox);
        pw->page_group = (gtk_radio_button_get_group(GTK_RADIO_BUTTON(button2)));
 
-       scrolled = gtk_scrolled_window_new(nullptr, nullptr);
+       scrolled = gq_gtk_scrolled_window_new(nullptr, nullptr);
        gtk_widget_set_size_request(scrolled, 50, 50);
-       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
+       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);

diff --git a/src/search.cc b/src/search.cc
index 79e1db2..786c807 100644 (file)
--- a/src/search.cc
+++ b/src/search.cc
@@ -3609,8 +3609,8 @@ void search_new(FileData *dir_fd, FileData *example_file)
 
        /* Done the types of searches */
 
-       scrolled = gtk_scrolled_window_new(nullptr, nullptr);
-       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
+       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(vbox), scrolled, TRUE, TRUE, 0);

diff --git a/src/toolbar.cc b/src/toolbar.cc
index 7966896..6e55623 100644 (file)
--- a/src/toolbar.cc
+++ b/src/toolbar.cc
@@ -422,10 +422,10 @@ GtkWidget *toolbar_select_new(LayoutWindow *lw, ToolbarType bar)
        toolbarlist[bar]->widget = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
        gtk_widget_show(toolbarlist[bar]->widget);
 
-       scrolled = gtk_scrolled_window_new(nullptr, nullptr);
+       scrolled = gq_gtk_scrolled_window_new(nullptr, nullptr);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
                                                        GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_NONE);
+       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);
        gtk_widget_show(scrolled);
 

diff --git a/src/ui-bookmark.cc b/src/ui-bookmark.cc
index 19a5218..7237066 100644 (file)
--- a/src/ui-bookmark.cc
+++ b/src/ui-bookmark.cc
@@ -800,7 +800,7 @@ GtkWidget *bookmark_list_new(const gchar *key,
        bm->editable = TRUE;
        bm->only_directories = FALSE;
 
-       scrolled = gtk_scrolled_window_new(nullptr, nullptr);
+       scrolled = gq_gtk_scrolled_window_new(nullptr, nullptr);
 
        PangoLayout *layout;
        gint width, height;

diff --git a/src/ui-help.cc b/src/ui-help.cc
index b795d3b..9d9ddee 100644 (file)
--- a/src/ui-help.cc
+++ b/src/ui-help.cc
@@ -221,8 +221,8 @@ GtkWidget *help_window_new(const gchar *title,
        gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
        gtk_widget_show(hbox);
 
-       scrolled = gtk_scrolled_window_new(nullptr, nullptr);
-       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
+       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);

diff --git a/src/ui-pathsel.cc b/src/ui-pathsel.cc
index 2a68783..785fb17 100644 (file)
--- a/src/ui-pathsel.cc
+++ b/src/ui-pathsel.cc
@@ -1051,8 +1051,8 @@ GtkWidget *path_selection_new_with_files(GtkWidget *entry, const gchar *path,
 
        dd->bookmark_list = scrolled;
 
-       scrolled = gtk_scrolled_window_new(nullptr, nullptr);
-       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
+       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(hbox2), scrolled, TRUE, TRUE, 0);
@@ -1122,8 +1122,8 @@ GtkWidget *path_selection_new_with_files(GtkWidget *entry, const gchar *path,
                gtk_box_pack_start(GTK_BOX(hbox2), dd->filter_combo, TRUE, TRUE, 0);
                gtk_widget_show(dd->filter_combo);
 
-               scrolled = gtk_scrolled_window_new(nullptr, nullptr);
-               gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
+               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);
                if (paned)

diff --git a/src/ui-utildlg.cc b/src/ui-utildlg.cc
index 8d7075f..f66924c 100644 (file)
--- a/src/ui-utildlg.cc
+++ b/src/ui-utildlg.cc
@@ -431,7 +431,7 @@ static void generic_dialog_setup(GenericDialog *gd,
        gtk_window_set_resizable(GTK_WINDOW(gd->dialog), TRUE);
        gtk_container_set_border_width(GTK_CONTAINER(gd->dialog), PREF_PAD_BORDER);
 
-       scrolled = gtk_scrolled_window_new(nullptr, nullptr);
+       scrolled = gq_gtk_scrolled_window_new(nullptr, nullptr);
        gtk_scrolled_window_set_propagate_natural_height(GTK_SCROLLED_WINDOW(scrolled), TRUE);
        gtk_scrolled_window_set_propagate_natural_width(GTK_SCROLLED_WINDOW(scrolled), TRUE);
        vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_BUTTON_SPACE);

diff --git a/src/utilops.cc b/src/utilops.cc
index 82376f1..ce00bba 100644 (file)
--- a/src/utilops.cc
+++ b/src/utilops.cc
@@ -515,8 +515,8 @@ static GtkWidget *file_util_dialog_add_list(GtkWidget *box, GList *list, gboolea
        GtkWidget *view;
        GtkListStore *store;
 
-       scrolled = gtk_scrolled_window_new(nullptr, nullptr);
-       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
+       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(box), scrolled, TRUE, TRUE, 0);

diff --git a/src/view-dir.cc b/src/view-dir.cc
index 85644c2..bdc724a 100644 (file)
--- a/src/view-dir.cc
+++ b/src/view-dir.cc
@@ -183,8 +183,8 @@ ViewDir *vd_new(LayoutWindow *lw)
 {
        auto vd = g_new0(ViewDir, 1);
 
-       vd->widget = gtk_scrolled_window_new(nullptr, nullptr);
-       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(vd->widget), GTK_SHADOW_IN);
+       vd->widget = gq_gtk_scrolled_window_new(nullptr, nullptr);
+       gq_gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(vd->widget), GTK_SHADOW_IN);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(vd->widget),
                                       GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
 

diff --git a/src/view-file/view-file.cc b/src/view-file/view-file.cc
index 2aa62a2..8624c11 100644 (file)
--- a/src/view-file/view-file.cc
+++ b/src/view-file/view-file.cc
@@ -1258,8 +1258,8 @@ ViewFile *vf_new(FileViewType type, FileData *dir_fd)
        vf->sort_ascend = TRUE;
        vf->read_metadata_in_idle_id = 0;
 
-       vf->scrolled = gtk_scrolled_window_new(nullptr, nullptr);
-       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(vf->scrolled), GTK_SHADOW_IN);
+       vf->scrolled = gq_gtk_scrolled_window_new(nullptr, nullptr);
+       gq_gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(vf->scrolled), GTK_SHADOW_IN);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(vf->scrolled),
                                       GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);