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

- gtk_widget_show_all() is deleted

src/bar.cc
src/compat.h
src/ui-misc.cc
src/utilops.cc
src/view-file/view-file.cc

index f6da00c..aad5e80 100644 (file)
@@ -449,7 +449,7 @@ static void bar_expander_cb(GObject *object, GParamSpec *, gpointer)
 
        if (gtk_expander_get_expanded(expander))
                {
-               gtk_widget_show_all(child);
+               gq_gtk_widget_show_all(child);
                }
        else
                {
index 6863330..a6808c2 100644 (file)
        #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)
+       #define gq_gtk_widget_show_all(widget) ;
 #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)
+       #define gq_gtk_widget_show_all(widget) gtk_widget_show_all(widget)
 #endif
 
 #endif /* COMPAT_H */
index 29a69b7..9821b61 100644 (file)
@@ -1313,7 +1313,7 @@ GtkWidget *pref_color_button_new(GtkWidget *parent_box,
                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);
+               gq_gtk_widget_show_all(hbox);
                }
        else
                {
index 0c389b3..868092a 100644 (file)
@@ -3352,7 +3352,7 @@ gchar *new_folder(GtkWindow *window , gchar *path)
        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);
+       gq_gtk_widget_show_all(dialog);
 
        while (ok_or_cancel == FALSE)
                {
index a40a58c..80b5a91 100644 (file)
@@ -1235,7 +1235,7 @@ static GtkWidget *vf_file_filter_init(ViewFile *vf)
        gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), class_filter_menu(vf));
        gtk_menu_shell_append(GTK_MENU_SHELL(menubar), menuitem);
        gtk_container_add(GTK_CONTAINER(menuitem), box);
-       gtk_widget_show_all(menuitem);
+       gq_gtk_widget_show_all(menuitem);
 
        return frame;
 }