GTK4: gtk_container_add()

GTK4 migration

gtk_container_add() is deleted. Replaced by calls to equivalent
widget-specific calls.

diff --git a/src/advanced-exif.cc b/src/advanced-exif.cc
index 3cfc33b..6bf0df9 100644 (file)
--- a/src/advanced-exif.cc
+++ b/src/advanced-exif.cc
@@ -450,7 +450,7 @@ GtkWidget *advanced_exif_new(LayoutWindow *lw)
        g_signal_connect(G_OBJECT(ew->window), "delete_event", G_CALLBACK(advanced_exif_delete_cb), ew);
 
        ew->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
-       gtk_container_add(GTK_CONTAINER(ew->window), ew->vbox);
+       gq_gtk_container_add(GTK_WIDGET(ew->window), ew->vbox);
        gtk_widget_show(ew->vbox);
 
        box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
@@ -519,7 +519,7 @@ GtkWidget *advanced_exif_new(LayoutWindow *lw)
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(ew->scrolled),
                                       GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
        gq_gtk_box_pack_start(GTK_BOX(ew->vbox), ew->scrolled, TRUE, TRUE, 0);
-       gtk_container_add(GTK_CONTAINER(ew->scrolled), ew->listview);
+       gq_gtk_container_add(GTK_WIDGET(ew->scrolled), ew->listview);
        gtk_widget_show(ew->listview);
        gtk_widget_show(ew->scrolled);
 

diff --git a/src/bar-comment.cc b/src/bar-comment.cc
index 9572643..b94dcfb 100644 (file)
--- a/src/bar-comment.cc
+++ b/src/bar-comment.cc
@@ -294,7 +294,7 @@ static GtkWidget *bar_pane_comment_new(const gchar *id, const gchar *title, cons
 
        pcd->comment_view = gtk_text_view_new();
        gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(pcd->comment_view), GTK_WRAP_WORD);
-       gtk_container_add(GTK_CONTAINER(scrolled), pcd->comment_view);
+       gq_gtk_container_add(GTK_WIDGET(scrolled), pcd->comment_view);
        g_signal_connect(G_OBJECT(pcd->comment_view), "populate-popup",
                         G_CALLBACK(bar_pane_comment_populate_popup), pcd);
        gtk_widget_show(pcd->comment_view);

diff --git a/src/bar-exif.cc b/src/bar-exif.cc
index 9dab63f..d22791a 100644 (file)
--- a/src/bar-exif.cc
+++ b/src/bar-exif.cc
@@ -121,7 +121,7 @@ static void bar_pane_exif_setup_entry_box(PaneExifData *ped, ExifEntry *ee)
        if (ee->box) g_object_unref(ee->box);
 
        ee->box = horizontal ? gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0) : gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
-       gtk_container_add(GTK_CONTAINER(ee->ebox), ee->box);
+       gq_gtk_container_add(GTK_WIDGET(ee->ebox), ee->box);
        gtk_widget_show(ee->box);
 
        ee->title_label = gtk_label_new(nullptr);
@@ -839,7 +839,7 @@ static GtkWidget *bar_pane_exif_new(const gchar *id, const gchar *title, gboolea
        ped->size_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
        ped->widget = gtk_event_box_new();
        ped->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
-       gtk_container_add(GTK_CONTAINER(ped->widget), ped->vbox);
+       gq_gtk_container_add(GTK_WIDGET(ped->widget), ped->vbox);
        gtk_widget_show(ped->vbox);
 
        ped->min_height = MIN_HEIGHT;

diff --git a/src/bar-keywords.cc b/src/bar-keywords.cc
index bdeaaae..ab82200 100644 (file)
--- a/src/bar-keywords.cc
+++ b/src/bar-keywords.cc
@@ -1496,7 +1496,7 @@ static GtkWidget *bar_pane_keywords_new(const gchar *id, const gchar *title, con
        gtk_widget_show(scrolled);
 
        pkd->keyword_view = gtk_text_view_new();
-       gtk_container_add(GTK_CONTAINER(scrolled), pkd->keyword_view);
+       gq_gtk_container_add(GTK_WIDGET(scrolled), pkd->keyword_view);
        g_signal_connect(G_OBJECT(pkd->keyword_view), "populate-popup",
                         G_CALLBACK(bar_pane_keywords_populate_popup_cb), pkd);
        gtk_widget_show(pkd->keyword_view);
@@ -1617,7 +1617,7 @@ static GtkWidget *bar_pane_keywords_new(const gchar *id, const gchar *title, con
 
        if (options->show_predefined_keyword_tree)
                {
-               gtk_container_add(GTK_CONTAINER(scrolled), pkd->keyword_treeview);
+               gq_gtk_container_add(GTK_WIDGET(scrolled), pkd->keyword_treeview);
                gtk_widget_show(pkd->keyword_treeview);
                }
 

diff --git a/src/bar.cc b/src/bar.cc
index 0d18eae..97e3d48 100644 (file)
--- a/src/bar.cc
+++ b/src/bar.cc
@@ -318,7 +318,7 @@ static void bar_expander_height_cb(GtkWidget *, gpointer data)
        g_signal_connect(controller, "key-pressed", G_CALLBACK(height_spin_key_press_cb), window);
 
        gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin), h);
-       gtk_container_add(GTK_CONTAINER(window), spin);
+       gq_gtk_container_add(GTK_WIDGET(window), spin);
        gtk_widget_show(spin);
        gtk_widget_grab_focus(GTK_WIDGET(spin));
 
@@ -652,7 +652,7 @@ void bar_add(GtkWidget *bar, GtkWidget *pane)
        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);
 
-       gtk_container_add(GTK_CONTAINER(expander), pane);
+       gq_gtk_container_add(GTK_WIDGET(expander), pane);
 
        gtk_expander_set_expanded(GTK_EXPANDER(expander), pd->expanded);
 
@@ -778,7 +778,7 @@ GtkWidget *bar_new(LayoutWindow *lw)
 
 
        bd->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
-       gtk_container_add(GTK_CONTAINER(scrolled), bd->vbox);
+       gq_gtk_container_add(GTK_WIDGET(scrolled), bd->vbox);
        gtk_viewport_set_shadow_type(GTK_VIEWPORT(gtk_bin_get_child(GTK_BIN(scrolled))), GTK_SHADOW_NONE);
 
        add_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);

diff --git a/src/collect-dlg.cc b/src/collect-dlg.cc
index f33b4cb..cd4c4c3 100644 (file)
--- a/src/collect-dlg.cc
+++ b/src/collect-dlg.cc
@@ -167,10 +167,10 @@ static void collection_save_or_append_dialog(gint type, CollectionData *cd)
 
                viewport = gtk_viewport_new(nullptr, nullptr);
                gtk_viewport_set_shadow_type(GTK_VIEWPORT(viewport), GTK_SHADOW_NONE);
-               gtk_container_add(GTK_CONTAINER(viewport), existing_collections);
+               gq_gtk_container_add(GTK_WIDGET(viewport), existing_collections);
                gtk_widget_show(viewport);
                gtk_widget_show(existing_collections);
-               gtk_container_add(GTK_CONTAINER(scrolled), viewport);
+               gq_gtk_container_add(GTK_WIDGET(scrolled), viewport);
 
                gq_gtk_box_pack_start(GTK_BOX(gdlg->vbox), scrolled, TRUE,TRUE, 0);
 

diff --git a/src/collect-table.cc b/src/collect-table.cc
index 9243aed..ffae68e 100644 (file)
--- a/src/collect-table.cc
+++ b/src/collect-table.cc
@@ -583,7 +583,7 @@ static void tip_show(CollectTable *ct)
        label = gtk_label_new(ct->show_text ? ct->tip_info->fd->path : ct->tip_info->fd->name);
 
        g_object_set_data(G_OBJECT(ct->tip_window), "tip_label", label);
-       gtk_container_add(GTK_CONTAINER(ct->tip_window), label);
+       gq_gtk_container_add(GTK_WIDGET(ct->tip_window), label);
        gtk_widget_show(label);
 
        display = gdk_display_get_default();
@@ -2705,7 +2705,7 @@ CollectTable *collection_table_new(CollectionData *cd)
        g_signal_connect(G_OBJECT(ct->listview), "key_press_event",
                         G_CALLBACK(collection_table_press_key_cb), ct);
 
-       gtk_container_add(GTK_CONTAINER(ct->scrolled), ct->listview);
+       gq_gtk_container_add(GTK_WIDGET(ct->scrolled), ct->listview);
        gtk_widget_show(ct->listview);
 
        collection_table_dnd_init(ct);

diff --git a/src/collect.cc b/src/collect.cc
index 6f87677..f42e546 100644 (file)
--- a/src/collect.cc
+++ b/src/collect.cc
@@ -1366,7 +1366,7 @@ CollectWindow *collection_window_new(const gchar *path)
                         G_CALLBACK(collection_window_keypress), cw);
 
        vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
-       gtk_container_add(GTK_CONTAINER(cw->window), vbox);
+       gq_gtk_container_add(GTK_WIDGET(cw->window), vbox);
        gtk_widget_show(vbox);
 
        cw->table = collection_table_new(cw->cd);
@@ -1384,7 +1384,7 @@ CollectWindow *collection_window_new(const gchar *path)
        gtk_widget_show(frame);
 
        status_label = gtk_label_new("");
-       gtk_container_add(GTK_CONTAINER(frame), status_label);
+       gq_gtk_container_add(GTK_WIDGET(frame), status_label);
        gtk_widget_show(status_label);
 
        extra_label = gtk_progress_bar_new();

diff --git a/src/compat.cc b/src/compat.cc
index fd8ecfb..762bcd2 100644 (file)
--- a/src/compat.cc
+++ b/src/compat.cc
@@ -18,6 +18,61 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "main.h"
 #include "compat.h"
 
+#ifdef HAVE_GTK4
+void gq_gtk_container_add(GtkWidget *container, GtkWidget *widget)
+{
+       if (GTK_IS_BUTTON(container))
+               {
+               gtk_button_set_child(GTK_BUTTON(container), widget);
+               }
+       else if (GTK_IS_BUTTON_BOX(container))
+               {
+               gtk_box_set_child(GTK_BUTTON_BOX(container), widget);
+               }
+       else if (GTK_IS_EXPANDER(container))
+               {
+               gtk_expander_set_child(GTK_EXPANDER(container), widget);
+               }
+       else if (GTK_IS_FRAME(container))
+               {
+               gtk_frame_set_child(GTK_FRAME(container), widget);
+               }
+       else if (GTK_IS_MENU_ITEM(container))
+               {
+               gtk_frame_set_child(container, widget); /* @FIXME GTK4 menu */
+               }
+       else if (GTK_IS_POPOVER(container))
+               {
+               gtk_popover_set_child(GTK_POPOVER(container), widget);
+               }
+       else if (GTK_IS_TOGGLE_BUTTON(container))
+               {
+               gtk_toggle_button_set_child(GTK_TOGGLE_BUTTON(container), widget);
+               }
+       else if (GTK_IS_TOOLBAR(container))
+               {
+               gtk_toolbar_set_child(GTK_TOOLBAR(container), widget);
+               }
+       else if (GTK_IS_VIEWPORT(container))
+               {
+               gtk_viewport_set_child(GTK_VIEWPORT(container), widget);
+               }
+       else if (GTK_IS_WINDOW(container))
+               {
+               gtk_window_set_child(GTK_WINDOW(container), widget);
+               }
+       else
+               {
+               g_abort();
+               }
+}
+#else
+void gq_gtk_container_add(GtkWidget *container, GtkWidget *widget)
+{
+       gtk_container_add(reinterpret_cast<GtkContainer *>(container), widget);
+}
+#endif
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */

diff --git a/src/compat.h b/src/compat.h
index a6460d9..6bb00f2 100644 (file)
--- a/src/compat.h
+++ b/src/compat.h
@@ -39,6 +39,8 @@
        #define gq_gtk_widget_queue_draw_area(widget, x, y, width, height) gtk_widget_queue_draw(widget);
        #define gq_gtk_widget_show_all(widget) ;
        #define gq_gtk_window_set_keep_above(window, setting) ;
+
+       void gq_gtk_container_add(GtkWidget *container, GtkWidget *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)
@@ -49,6 +51,8 @@
        #define gq_gtk_widget_queue_draw_area(widget, x, y, width, height) gtk_widget_queue_draw_area(widget, x, y, width, height);
        #define gq_gtk_widget_show_all(widget) gtk_widget_show_all(widget)
        #define gq_gtk_window_set_keep_above(window, setting) gtk_window_set_keep_above(window, setting)
+
+       void gq_gtk_container_add(GtkWidget *container, GtkWidget *widget);
 #endif
 
 #endif /* COMPAT_H */

diff --git a/src/desktop-file.cc b/src/desktop-file.cc
index 2188ab5..3c0ffb3 100644 (file)
--- a/src/desktop-file.cc
+++ b/src/desktop-file.cc
@@ -194,7 +194,7 @@ static void editor_window_new(const gchar *src_path, const gchar *desktop_name)
        gtk_container_set_border_width(GTK_CONTAINER(ew->window), PREF_PAD_BORDER);
 
        win_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_SPACE);
-       gtk_container_add(GTK_CONTAINER(ew->window), win_vbox);
+       gq_gtk_container_add(GTK_WIDGET(ew->window), win_vbox);
        gtk_widget_show(win_vbox);
 
        hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
@@ -220,7 +220,7 @@ static void editor_window_new(const gchar *src_path, const gchar *desktop_name)
 
        ew->save_button = pref_button_new(nullptr, GQ_ICON_SAVE, _("Save"),
                                 G_CALLBACK(editor_window_save_cb), ew);
-       gtk_container_add(GTK_CONTAINER(button_hbox), ew->save_button);
+       gq_gtk_container_add(GTK_WIDGET(button_hbox), ew->save_button);
        gtk_widget_set_can_default(ew->save_button, TRUE);
        gtk_widget_set_sensitive(ew->save_button, FALSE);
        gtk_widget_show(ew->save_button);
@@ -228,7 +228,7 @@ static void editor_window_new(const gchar *src_path, const gchar *desktop_name)
 
        button = pref_button_new(nullptr, GQ_ICON_CLOSE, _("Close"),
                                 G_CALLBACK(editor_window_close_cb), ew);
-       gtk_container_add(GTK_CONTAINER(button_hbox), button);
+       gq_gtk_container_add(GTK_WIDGET(button_hbox), button);
        gtk_widget_set_can_default(button, TRUE);
        gtk_widget_show(button);
 
@@ -246,7 +246,7 @@ static void editor_window_new(const gchar *src_path, const gchar *desktop_name)
        gtk_widget_show(scrolled);
 
        text_view = gtk_text_view_new();
-       gtk_container_add(GTK_CONTAINER(scrolled), text_view);
+       gq_gtk_container_add(GTK_WIDGET(scrolled), text_view);
        gtk_widget_show(text_view);
 
        ew->buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text_view));
@@ -550,7 +550,7 @@ static void editor_list_window_create()
        gtk_container_set_border_width(GTK_CONTAINER(ewl->window), PREF_PAD_BORDER);
 
        win_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_SPACE);
-       gtk_container_add(GTK_CONTAINER(ewl->window), win_vbox);
+       gq_gtk_container_add(GTK_WIDGET(ewl->window), win_vbox);
        gtk_widget_show(win_vbox);
 
        hbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
@@ -561,19 +561,19 @@ static void editor_list_window_create()
 
        button = pref_button_new(nullptr, GQ_ICON_HELP, _("Help"),
                                 G_CALLBACK(editor_list_window_help_cb), ewl);
-       gtk_container_add(GTK_CONTAINER(hbox), button);
+       gq_gtk_container_add(GTK_WIDGET(hbox), button);
        gtk_widget_set_can_default(button, TRUE);
        gtk_widget_show(button);
 
        button = pref_button_new(nullptr, GQ_ICON_NEW, _("New"),
                                 G_CALLBACK(editor_list_window_new_cb), ewl);
-       gtk_container_add(GTK_CONTAINER(hbox), button);
+       gq_gtk_container_add(GTK_WIDGET(hbox), button);
        gtk_widget_set_can_default(button, TRUE);
        gtk_widget_show(button);
 
        button = pref_button_new(nullptr, GQ_ICON_EDIT, _("Edit"),
                                 G_CALLBACK(editor_list_window_edit_cb), ewl);
-       gtk_container_add(GTK_CONTAINER(hbox), button);
+       gq_gtk_container_add(GTK_WIDGET(hbox), button);
        gtk_widget_set_can_default(button, TRUE);
        gtk_widget_set_sensitive(button, FALSE);
        gtk_widget_show(button);
@@ -581,7 +581,7 @@ static void editor_list_window_create()
 
        button = pref_button_new(nullptr, GQ_ICON_DELETE, "Delete",
                                 G_CALLBACK(editor_list_window_delete_cb), ewl);
-       gtk_container_add(GTK_CONTAINER(hbox), button);
+       gq_gtk_container_add(GTK_WIDGET(hbox), button);
        gtk_widget_set_can_default(button, TRUE);
        gtk_widget_set_sensitive(button, FALSE);
        gtk_widget_show(button);
@@ -589,7 +589,7 @@ static void editor_list_window_create()
 
        button = pref_button_new(nullptr, GQ_ICON_CLOSE, _("Close"),
                                 G_CALLBACK(editor_list_window_close_cb), ewl);
-       gtk_container_add(GTK_CONTAINER(hbox), button);
+       gq_gtk_container_add(GTK_WIDGET(hbox), button);
        gtk_widget_set_can_default(button, TRUE);
        gtk_widget_show(button);
 
@@ -674,7 +674,7 @@ static void editor_list_window_create()
        /* set initial sort order */
     gtk_tree_sortable_set_sort_column_id(sortable, DESKTOP_FILE_COLUMN_NAME, GTK_SORT_ASCENDING);
 
-       gtk_container_add(GTK_CONTAINER(scrolled), ewl->view);
+       gq_gtk_container_add(GTK_WIDGET(scrolled), ewl->view);
        gtk_widget_show(ewl->view);
 
        gtk_widget_show(ewl->window);

diff --git a/src/dnd.cc b/src/dnd.cc
index a21cfc6..b4de9c4 100644 (file)
--- a/src/dnd.cc
+++ b/src/dnd.cc
@@ -187,7 +187,7 @@ void dnd_set_drag_label(GtkWidget *widget, GdkDragContext *context, const gchar
        gtk_widget_realize (window);
 
        label = gtk_label_new(text);
-       gtk_container_add(GTK_CONTAINER (window), label);
+       gq_gtk_container_add(GTK_WIDGET (window), label);
        gtk_widget_show(label);
        gtk_drag_set_icon_widget(context, window, -15, 10);
        g_signal_connect(G_OBJECT(widget), "drag_end",

diff --git a/src/dupe.cc b/src/dupe.cc
index d166643..f9d61e6 100644 (file)
--- a/src/dupe.cc
+++ b/src/dupe.cc
@@ -4629,7 +4629,7 @@ DupeWindow *dupe_window_new()
                         G_CALLBACK(dupe_window_keypress_cb), dw);
 
        vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
-       gtk_container_add(GTK_CONTAINER(dw->window), vbox);
+       gq_gtk_container_add(GTK_WIDGET(dw->window), vbox);
        gtk_widget_show(vbox);
 
        dw->table = gtk_table_new(1, 3, FALSE);
@@ -4678,7 +4678,7 @@ DupeWindow *dupe_window_new()
        g_signal_connect(gtk_tree_view_get_column(GTK_TREE_VIEW(dw->listview), DUPE_COLUMN_DIMENSIONS - 1), "clicked", (GCallback)column_clicked_cb, dw);
        g_signal_connect(gtk_tree_view_get_column(GTK_TREE_VIEW(dw->listview), DUPE_COLUMN_PATH - 1), "clicked", (GCallback)column_clicked_cb, dw);
 
-       gtk_container_add(GTK_CONTAINER(scrolled), dw->listview);
+       gq_gtk_container_add(GTK_WIDGET(scrolled), dw->listview);
        gtk_widget_show(dw->listview);
 
        dw->second_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
@@ -4710,7 +4710,7 @@ DupeWindow *dupe_window_new()
 
        dupe_listview_add_column(dw, dw->second_listview, 1, _("Compare to:"), FALSE, FALSE);
 
-       gtk_container_add(GTK_CONTAINER(scrolled), dw->second_listview);
+       gq_gtk_container_add(GTK_WIDGET(scrolled), dw->second_listview);
        gtk_widget_show(dw->second_listview);
 
        dw->second_status_label = gtk_label_new("");
@@ -4730,7 +4730,7 @@ DupeWindow *dupe_window_new()
        gtk_widget_show(frame);
 
        dw->status_label = gtk_label_new("");
-       gtk_container_add(GTK_CONTAINER(frame), dw->status_label);
+       gq_gtk_container_add(GTK_WIDGET(frame), dw->status_label);
        gtk_widget_show(dw->status_label);
 
        dw->extra_label = gtk_progress_bar_new();
@@ -4804,18 +4804,18 @@ DupeWindow *dupe_window_new()
 
        button = pref_button_new(nullptr, GQ_ICON_HELP, _("Help"), G_CALLBACK(dupe_help_cb), nullptr);
        gtk_widget_set_tooltip_text(GTK_WIDGET(button), "F1");
-       gtk_container_add(GTK_CONTAINER(hbox), button);
+       gq_gtk_container_add(GTK_WIDGET(hbox), button);
        gtk_widget_set_can_default(button, TRUE);
        gtk_widget_show(button);
 
        button = pref_button_new(nullptr, GQ_ICON_STOP, _("Stop"), G_CALLBACK(dupe_check_stop_cb), dw);
-       gtk_container_add(GTK_CONTAINER(hbox), button);
+       gq_gtk_container_add(GTK_WIDGET(hbox), button);
        gtk_widget_set_can_default(button, TRUE);
        gtk_widget_show(button);
 
        button = pref_button_new(nullptr, GQ_ICON_CLOSE, _("Close"), G_CALLBACK(dupe_window_close_cb), dw);
        gtk_widget_set_tooltip_text(GTK_WIDGET(button), "Ctrl-W");
-       gtk_container_add(GTK_CONTAINER(hbox), button);
+       gq_gtk_container_add(GTK_WIDGET(hbox), button);
        gtk_widget_set_can_default(button, TRUE);
        gtk_widget_grab_default(button);
        gtk_widget_show(button);

diff --git a/src/editors.cc b/src/editors.cc
index 94add07..f3a2a53 100644 (file)
--- a/src/editors.cc
+++ b/src/editors.cc
@@ -604,7 +604,7 @@ static EditorVerboseData *editor_verbose_window(EditorData *ed, const gchar *tex
        vd->text = gtk_text_view_new();
        gtk_text_view_set_editable(GTK_TEXT_VIEW(vd->text), FALSE);
        gtk_widget_set_size_request(vd->text, EDITOR_WINDOW_WIDTH, EDITOR_WINDOW_HEIGHT);
-       gtk_container_add(GTK_CONTAINER(scrolled), vd->text);
+       gq_gtk_container_add(GTK_WIDGET(scrolled), vd->text);
        gtk_widget_show(vd->text);
 
        hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);

diff --git a/src/fullscreen.cc b/src/fullscreen.cc
index 69058fd..0df230a 100644 (file)
--- a/src/fullscreen.cc
+++ b/src/fullscreen.cc
@@ -297,7 +297,7 @@ FullScreenData *fullscreen_start(GtkWidget *window, ImageWindow *imd,
 
        fs->imd = image_new(FALSE);
 
-       gtk_container_add(GTK_CONTAINER(fs->window), fs->imd->widget);
+       gq_gtk_container_add(GTK_WIDGET(fs->window), fs->imd->widget);
 
        image_background_set_color_from_options(fs->imd, TRUE);
        image_set_delay_flip(fs->imd, options->fullscreen.clean_flip);

diff --git a/src/image.cc b/src/image.cc
index e63ccdf..2d11182 100644 (file)
--- a/src/image.cc
+++ b/src/image.cc
@@ -2142,7 +2142,7 @@ void image_set_frame(ImageWindow *imd, gboolean frame)
                DEBUG_NAME(imd->frame);
                g_object_ref(imd->pr);
                if (imd->has_frame != -1) gtk_container_remove(GTK_CONTAINER(imd->widget), imd->pr);
-               gtk_container_add(GTK_CONTAINER(imd->frame), imd->pr);
+               gq_gtk_container_add(GTK_WIDGET(imd->frame), imd->pr);
 
                g_object_unref(imd->pr);
                gtk_widget_set_can_focus(imd->frame, TRUE);

diff --git a/src/img-view.cc b/src/img-view.cc
index d9c40bd..cd529dc 100644 (file)
--- a/src/img-view.cc
+++ b/src/img-view.cc
@@ -931,7 +931,7 @@ static ViewWindow *real_view_window_new(FileData *fd, GList *list, CollectionDat
        image_auto_refresh_enable(vw->imd, TRUE);
        image_top_window_set_sync(vw->imd, TRUE);
 
-       gtk_container_add(GTK_CONTAINER(vw->window), vw->imd->widget);
+       gq_gtk_container_add(GTK_WIDGET(vw->window), vw->imd->widget);
        gtk_widget_show(vw->imd->widget);
 
        view_window_dnd_init(vw);

diff --git a/src/layout-config.cc b/src/layout-config.cc
index ae05b9c..932a5f3 100644 (file)
--- a/src/layout-config.cc
+++ b/src/layout-config.cc
@@ -260,7 +260,7 @@ static GtkWidget *layout_config_widget(GtkWidget *group, GtkWidget *box, gint st
        layout_config_table_button(table, ls.c, "3");
 
        gtk_widget_set_size_request(table, LAYOUT_STYLE_SIZE, LAYOUT_STYLE_SIZE);
-       gtk_container_add(GTK_CONTAINER(group), table);
+       gq_gtk_container_add(GTK_WIDGET(group), table);
        gtk_widget_show(table);
 
        gtk_widget_show(group);
@@ -347,7 +347,7 @@ GtkWidget *layout_config_new()
                gtk_list_store_set(store, &iter, COLUMN_TEXT, _(layout_titles[i]), COLUMN_KEY, i, -1);
                }
 
-       gtk_container_add(GTK_CONTAINER(scrolled), lc->listview);
+       gq_gtk_container_add(GTK_WIDGET(scrolled), lc->listview);
        gtk_widget_show(lc->listview);
 
        pref_label_new(lc->box, _("(drag to change order)"));

diff --git a/src/layout.cc b/src/layout.cc
index ff675f7..0053ace 100644 (file)
--- a/src/layout.cc
+++ b/src/layout.cc
@@ -337,7 +337,7 @@ static GtkWidget *layout_tool_setup(LayoutWindow *lw)
                toolbar = layout_actions_toolbar(lw, TOOLBAR_MAIN);
                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);
+               gq_gtk_container_add(GTK_WIDGET(scroll_window), menu_bar);
 
                gtk_widget_show(scroll_window);
                gtk_widget_show(menu_bar);
@@ -487,7 +487,8 @@ static GtkWidget *layout_sort_button(LayoutWindow *lw, GtkWidget *box)
        gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
        gtk_button_set_image_position(GTK_BUTTON(button), GTK_POS_RIGHT);
 
-       gtk_container_add(GTK_CONTAINER(frame), button);
+       gq_gtk_container_add(GTK_WIDGET(frame), button);
+
        gtk_widget_show(button);
 
        return button;
@@ -585,7 +586,7 @@ static GtkWidget *layout_zoom_button(LayoutWindow *lw, GtkWidget *box, gint size
        gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
        gtk_button_set_image_position(GTK_BUTTON(button), GTK_POS_RIGHT);
 
-       gtk_container_add(GTK_CONTAINER(frame), button);
+       gq_gtk_container_add(GTK_WIDGET(frame), button);
        gtk_widget_show(button);
 
        return button;
@@ -812,7 +813,7 @@ static GtkWidget *layout_status_label(gchar *text, GtkWidget *box, gboolean star
 
        label = gtk_label_new(text ? text : "");
        gtk_label_set_ellipsize(GTK_LABEL(label), PANGO_ELLIPSIZE_END);
-       gtk_container_add(GTK_CONTAINER(frame), label);
+       gq_gtk_container_add(GTK_WIDGET(frame), label);
        gtk_widget_show(label);
 
        return label;
@@ -883,7 +884,7 @@ static void layout_status_setup(LayoutWindow *lw, GtkWidget *box, gboolean small
        toolbar_frame = gtk_frame_new(nullptr);
        DEBUG_NAME(toolbar_frame);
        gq_gtk_frame_set_shadow_type(GTK_FRAME(toolbar_frame), GTK_SHADOW_IN);
-       gtk_container_add(GTK_CONTAINER(toolbar_frame), toolbar);
+       gq_gtk_container_add(GTK_WIDGET(toolbar_frame), toolbar);
        gtk_widget_show(toolbar_frame);
        gtk_widget_show(toolbar);
        gq_gtk_box_pack_end(GTK_BOX(hbox), toolbar_frame, FALSE, FALSE, 0);
@@ -1648,7 +1649,7 @@ 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);
+       gq_gtk_container_add(GTK_WIDGET(lw->tools), vbox);
        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);
 
@@ -2330,7 +2331,7 @@ void layout_show_config_window(LayoutWindow *lw)
 
        win_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_SPACE);
        DEBUG_NAME(win_vbox);
-       gtk_container_add(GTK_CONTAINER(lc->configwindow), win_vbox);
+       gq_gtk_container_add(GTK_WIDGET(lc->configwindow), win_vbox);
        gtk_widget_show(win_vbox);
 
        hbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
@@ -2341,7 +2342,7 @@ void layout_show_config_window(LayoutWindow *lw)
 
        button = pref_button_new(nullptr, GQ_ICON_OK, "OK",
                                 G_CALLBACK(layout_config_ok_cb), lc);
-       gtk_container_add(GTK_CONTAINER(hbox), button);
+       gq_gtk_container_add(GTK_WIDGET(hbox), button);
        gtk_widget_set_can_default(button, TRUE);
        gtk_widget_grab_default(button);
        gtk_widget_show(button);
@@ -2350,25 +2351,25 @@ void layout_show_config_window(LayoutWindow *lw)
 /*
        button = pref_button_new(NULL, GQ_ICON_SAVE, _("Save"), FALSE,
                                 G_CALLBACK(layout_config_save_cb), NULL);
-       gtk_container_add(GTK_CONTAINER(hbox), button);
+       gq_gtk_container_add(GTK_WIDGET(hbox), button);
        GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
        gtk_widget_show(button);
 */
        button = pref_button_new(nullptr, GQ_ICON_HELP, _("Help"),
                                 G_CALLBACK(layout_config_help_cb), lc);
-       gtk_container_add(GTK_CONTAINER(hbox), button);
+       gq_gtk_container_add(GTK_WIDGET(hbox), button);
        gtk_widget_set_can_default(button, TRUE);
        gtk_widget_show(button);
 
        button = pref_button_new(nullptr, GQ_ICON_APPLY, _("Apply"),
                                 G_CALLBACK(layout_config_apply_cb), lc);
-       gtk_container_add(GTK_CONTAINER(hbox), button);
+       gq_gtk_container_add(GTK_WIDGET(hbox), button);
        gtk_widget_set_can_default(button, TRUE);
        gtk_widget_show(button);
 
        button = pref_button_new(nullptr, GQ_ICON_CANCEL, _("Cancel"),
                                 G_CALLBACK(layout_config_close_cb), lc);
-       gtk_container_add(GTK_CONTAINER(hbox), button);
+       gq_gtk_container_add(GTK_WIDGET(hbox), button);
        gtk_widget_set_can_default(button, TRUE);
        gtk_widget_show(button);
 
@@ -2382,7 +2383,7 @@ void layout_show_config_window(LayoutWindow *lw)
 
        vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_SPACE);
        DEBUG_NAME(vbox);
-       gtk_container_add(GTK_CONTAINER(frame), vbox);
+       gq_gtk_container_add(GTK_WIDGET(frame), vbox);
        gtk_widget_show(vbox);
 
 
@@ -2685,7 +2686,7 @@ LayoutWindow *layout_new_with_geometry(FileData *dir_fd, LayoutOptions *lop,
 
        lw->main_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
        DEBUG_NAME(lw->main_box);
-       gtk_container_add(GTK_CONTAINER(lw->window), lw->main_box);
+       gq_gtk_container_add(GTK_WIDGET(lw->window), lw->main_box);
        gtk_widget_show(lw->main_box);
 
        layout_grid_setup(lw);

diff --git a/src/logwindow.cc b/src/logwindow.cc
index 1453e55..bd72919 100644 (file)
--- a/src/logwindow.cc
+++ b/src/logwindow.cc
@@ -405,7 +405,7 @@ static LogWindow *log_window_create(LayoutWindow *lw)
        window = window_new(GTK_WINDOW_TOPLEVEL, "log", nullptr, nullptr, _("Log"));
        DEBUG_NAME(window);
        win_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_SPACE);
-       gtk_container_add(GTK_CONTAINER(window), win_vbox);
+       gq_gtk_container_add(GTK_WIDGET(window), win_vbox);
        gtk_widget_show(win_vbox);
 
        gtk_window_resize(GTK_WINDOW(window), lw->options.log_window.w,
@@ -442,7 +442,7 @@ static LogWindow *log_window_create(LayoutWindow *lw)
        buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
        gtk_text_buffer_get_start_iter(buffer, &iter);
        gtk_text_buffer_create_mark(buffer, "end", &iter, FALSE);
-       gtk_container_add(GTK_CONTAINER(scrolledwin), text);
+       gq_gtk_container_add(GTK_WIDGET(scrolledwin), text);
        gtk_widget_show(text);
 
 #ifdef DEBUG
@@ -458,7 +458,7 @@ static LogWindow *log_window_create(LayoutWindow *lw)
        logwin->pause = gtk_toggle_button_new();
        label = gtk_label_new("Pause");
        gtk_widget_set_tooltip_text(GTK_WIDGET(logwin->pause), _("Pause scrolling"));
-       gtk_container_add(GTK_CONTAINER(logwin->pause), label) ;
+       gq_gtk_container_add(GTK_WIDGET(logwin->pause), label) ;
        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);
@@ -466,7 +466,7 @@ static LogWindow *log_window_create(LayoutWindow *lw)
        logwin->wrap = gtk_toggle_button_new();
        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) ;
+       gq_gtk_container_add(GTK_WIDGET(logwin->wrap), label) ;
        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);
@@ -474,7 +474,7 @@ static LogWindow *log_window_create(LayoutWindow *lw)
        logwin->timer_data = gtk_toggle_button_new();
        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) ;
+       gq_gtk_container_add(GTK_WIDGET(logwin->timer_data), label) ;
        gq_gtk_box_pack_start(GTK_BOX(hbox),logwin->timer_data, FALSE, FALSE, 0) ;
        if (options->log_window.timer_data)
                {
@@ -484,7 +484,7 @@ static LogWindow *log_window_create(LayoutWindow *lw)
        gtk_widget_show_all(logwin->timer_data);
 
        search_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-       gtk_container_add(GTK_CONTAINER(hbox), search_box);
+       gq_gtk_container_add(GTK_WIDGET(hbox), search_box);
        gtk_widget_show(search_box);
 
        logwin->search_entry_box = gtk_entry_new();

diff --git a/src/osd.cc b/src/osd.cc
index d38ce49..31c0a1c 100644 (file)
--- a/src/osd.cc
+++ b/src/osd.cc
@@ -173,7 +173,7 @@ GtkWidget *osd_new(gint max_cols, GtkWidget *template_view)
 
        viewport = gtk_viewport_new(nullptr, nullptr);
        gtk_viewport_set_shadow_type(GTK_VIEWPORT(viewport), GTK_SHADOW_NONE);
-       gtk_container_add(GTK_CONTAINER(scrolled), viewport);
+       gq_gtk_container_add(GTK_WIDGET(scrolled), viewport);
        gtk_widget_show(viewport);
 
        entries = (sizeof(predefined_tags) / sizeof(predefined_tags[0])) - 1;
@@ -181,7 +181,7 @@ GtkWidget *osd_new(gint max_cols, GtkWidget *template_view)
 
        GtkTable *table;
        table = GTK_TABLE(gtk_table_new(max_rows, max_cols, FALSE));
-       gtk_container_add(GTK_CONTAINER(viewport), GTK_WIDGET(table));
+       gq_gtk_container_add(GTK_WIDGET(viewport), GTK_WIDGET(table));
        gtk_widget_show(GTK_WIDGET(table));
 
        for (rows = 0; rows < max_rows; rows++)

diff --git a/src/pan-view/pan-view-filter.cc b/src/pan-view/pan-view-filter.cc
index 8e45570..b25a142 100644 (file)
--- a/src/pan-view/pan-view-filter.cc
+++ b/src/pan-view/pan-view-filter.cc
@@ -92,7 +92,7 @@ PanViewFilterUi *pan_filter_ui_new(PanWindow *pw)
        gtk_button_set_relief(GTK_BUTTON(ui->filter_button), GTK_RELIEF_NONE);
        gtk_widget_set_focus_on_click(ui->filter_button, FALSE);
        hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP);
-       gtk_container_add(GTK_CONTAINER(ui->filter_button), hbox);
+       gq_gtk_container_add(GTK_WIDGET(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);
        gq_gtk_box_pack_start(GTK_BOX(hbox), ui->filter_button_arrow, FALSE, FALSE, 0);

diff --git a/src/preferences.cc b/src/preferences.cc
index f1376f0..96930a8 100644 (file)
--- a/src/preferences.cc
+++ b/src/preferences.cc
@@ -1790,11 +1790,11 @@ static GtkWidget *scrolled_notebook_page(GtkWidget *notebook, const gchar *title
 
        viewport = gtk_viewport_new(nullptr, nullptr);
        gtk_viewport_set_shadow_type(GTK_VIEWPORT(viewport), GTK_SHADOW_NONE);
-       gtk_container_add(GTK_CONTAINER(scrolled), viewport);
+       gq_gtk_container_add(GTK_WIDGET(scrolled), viewport);
        gtk_widget_show(viewport);
 
        vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
-       gtk_container_add(GTK_CONTAINER(viewport), vbox);
+       gq_gtk_container_add(GTK_WIDGET(viewport), vbox);
        gtk_widget_show(vbox);
 
        return vbox;
@@ -2366,7 +2366,7 @@ static GtkWidget *create_popover(GtkWidget *parent, GtkWidget *child, GtkPositio
 
        popover = gtk_popover_new(parent);
        gtk_popover_set_position(GTK_POPOVER (popover), pos);
-       gtk_container_add (GTK_CONTAINER(popover), child);
+       gq_gtk_container_add(GTK_WIDGET(popover), child);
        gtk_container_set_border_width(GTK_CONTAINER (popover), 6);
        gtk_widget_show (child);
 
@@ -2487,7 +2487,7 @@ static void config_tab_osd(GtkWidget *notebook)
        gtk_widget_set_tooltip_markup(image_overlay_template_view,
                                        _("Extensive formatting options are shown in the Help file"));
 
-       gtk_container_add(GTK_CONTAINER(scrolled), image_overlay_template_view);
+       gq_gtk_container_add(GTK_WIDGET(scrolled), image_overlay_template_view);
        gtk_widget_show(image_overlay_template_view);
 
        hbox = pref_box_new(group, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_BUTTON_GAP);
@@ -2805,7 +2805,7 @@ static void config_tab_files(GtkWidget *notebook)
        gtk_tree_view_column_set_sort_column_id(column, FILETYPES_COLUMN_SIDECAR);
 
        filter_store_populate();
-       gtk_container_add(GTK_CONTAINER(scrolled), filter_view);
+       gq_gtk_container_add(GTK_WIDGET(scrolled), filter_view);
        gtk_widget_show(filter_view);
 
        hbox = pref_box_new(group, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_BUTTON_GAP);
@@ -3280,7 +3280,7 @@ static void config_tab_keywords(GtkWidget *notebook)
                }
 #endif
 
-       gtk_container_add(GTK_CONTAINER(scrolled), keyword_text);
+       gq_gtk_container_add(GTK_WIDGET(scrolled), keyword_text);
        gtk_widget_show(keyword_text);
 
        gtk_text_view_set_editable(GTK_TEXT_VIEW(keyword_text), TRUE);
@@ -3780,7 +3780,7 @@ static void config_tab_accelerators(GtkWidget *notebook)
        gtk_tree_view_set_search_equal_func(GTK_TREE_VIEW(accel_view), accel_search_function_cb, nullptr, nullptr);
 
        accel_store_populate();
-       gtk_container_add(GTK_CONTAINER(scrolled), accel_view);
+       gq_gtk_container_add(GTK_WIDGET(scrolled), accel_view);
        gtk_widget_show(accel_view);
 
        hbox = pref_box_new(group, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_BUTTON_GAP);
@@ -4041,7 +4041,7 @@ static void config_window_create(LayoutWindow *lw)
        gtk_container_set_border_width(GTK_CONTAINER(configwindow), PREF_PAD_BORDER);
 
        win_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_SPACE);
-       gtk_container_add(GTK_CONTAINER(configwindow), win_vbox);
+       gq_gtk_container_add(GTK_WIDGET(configwindow), win_vbox);
        gtk_widget_show(win_vbox);
 
        notebook = gtk_notebook_new();
@@ -4074,13 +4074,13 @@ static void config_window_create(LayoutWindow *lw)
 
        button = pref_button_new(nullptr, GQ_ICON_HELP, _("Help"),
                                 G_CALLBACK(config_window_help_cb), notebook);
-       gtk_container_add(GTK_CONTAINER(hbox), button);
+       gq_gtk_container_add(GTK_WIDGET(hbox), button);
        gtk_widget_set_can_default(button, TRUE);
        gtk_widget_show(button);
 
        button = pref_button_new(nullptr, GQ_ICON_OK, "OK",
                                 G_CALLBACK(config_window_ok_cb), notebook);
-       gtk_container_add(GTK_CONTAINER(hbox), button);
+       gq_gtk_container_add(GTK_WIDGET(hbox), button);
        gtk_widget_set_can_default(button, TRUE);
        gtk_widget_grab_default(button);
        gtk_widget_show(button);
@@ -4089,7 +4089,7 @@ static void config_window_create(LayoutWindow *lw)
 
        button = pref_button_new(nullptr, GQ_ICON_CANCEL, _("Cancel"),
                                 G_CALLBACK(config_window_close_cb), nullptr);
-       gtk_container_add(GTK_CONTAINER(hbox), button);
+       gq_gtk_container_add(GTK_WIDGET(hbox), button);
        gtk_widget_set_can_default(button, TRUE);
        gtk_widget_show(button);
 

diff --git a/src/print.cc b/src/print.cc
index 3f08f2b..323cb63 100644 (file)
--- a/src/print.cc
+++ b/src/print.cc
@@ -406,7 +406,7 @@ static void print_text_menu(GtkWidget *box, PrintWindow *pw)
        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);
+       gq_gtk_container_add(GTK_WIDGET(scrolled), image_text_template_view);
        gtk_widget_show(image_text_template_view);
 
        buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(image_text_template_view));
@@ -465,7 +465,7 @@ static void print_text_menu(GtkWidget *box, PrintWindow *pw)
        g_object_ref(pw->page_text);
 
        gtk_widget_set_tooltip_markup(page_text_view, (_("Text shown on each page of a single or multi-page print job")));
-       gtk_container_add(GTK_CONTAINER(scrolled), page_text_view);
+       gq_gtk_container_add(GTK_WIDGET(scrolled), page_text_view);
        gtk_widget_show(page_text_view);
 
        hbox = pref_box_new(subgroup, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_BUTTON_GAP);

diff --git a/src/search.cc b/src/search.cc
index 90c69d0..7fc3da9 100644 (file)
--- a/src/search.cc
+++ b/src/search.cc
@@ -3368,7 +3368,7 @@ void search_new(FileData *dir_fd, FileData *example_file)
 
        vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
        gtk_container_set_border_width(GTK_CONTAINER(vbox), PREF_PAD_GAP);
-       gtk_container_add(GTK_CONTAINER(sd->window), vbox);
+       gq_gtk_container_add(GTK_WIDGET(sd->window), vbox);
        gtk_widget_show(vbox);
 
        sd->box_search = pref_box_new(vbox, FALSE, GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
@@ -3654,7 +3654,7 @@ void search_new(FileData *dir_fd, FileData *example_file)
 
        sd->result_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
        g_object_unref(store);
-       gtk_container_add(GTK_CONTAINER(scrolled), sd->result_view);
+       gq_gtk_container_add(GTK_WIDGET(scrolled), sd->result_view);
        gtk_widget_show(sd->result_view);
 
        selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(sd->result_view));
@@ -3695,7 +3695,7 @@ void search_new(FileData *dir_fd, FileData *example_file)
 
        sd->label_status = gtk_label_new("");
        gtk_widget_set_size_request(sd->label_status, 50, -1);
-       gtk_container_add(GTK_CONTAINER(frame), sd->label_status);
+       gq_gtk_container_add(GTK_WIDGET(frame), sd->label_status);
        gtk_widget_show(sd->label_status);
 
        sd->label_progress = gtk_progress_bar_new();

diff --git a/src/toolbar.cc b/src/toolbar.cc
index 2562853..f4482b0 100644 (file)
--- a/src/toolbar.cc
+++ b/src/toolbar.cc
@@ -208,7 +208,7 @@ static void toolbarlist_add_button(const gchar *name, const gchar *label,
        toolbar_entry, reinterpret_cast<GDestroyNotify>(toolbar_item_free));
 
        hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_BUTTON_GAP);
-       gtk_container_add(GTK_CONTAINER(toolbar_entry->button), hbox);
+       gq_gtk_container_add(GTK_WIDGET(toolbar_entry->button), hbox);
        gtk_widget_show(hbox);
 
        toolbar_entry->button_label = gtk_label_new(label);
@@ -431,7 +431,7 @@ GtkWidget *toolbar_select_new(LayoutWindow *lw, ToolbarType bar)
 
        toolbarlist[bar]->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
        gtk_widget_show(toolbarlist[bar]->vbox);
-       gtk_container_add(GTK_CONTAINER(scrolled), toolbarlist[bar]->vbox);
+       gq_gtk_container_add(GTK_WIDGET(scrolled), toolbarlist[bar]->vbox);
        gtk_viewport_set_shadow_type(GTK_VIEWPORT(gtk_bin_get_child(GTK_BIN(scrolled))),
                                                                                                                                GTK_SHADOW_NONE);
 

diff --git a/src/ui-bookmark.cc b/src/ui-bookmark.cc
index 7318c8f..6f64a49 100644 (file)
--- a/src/ui-bookmark.cc
+++ b/src/ui-bookmark.cc
@@ -612,7 +612,7 @@ static void bookmark_populate(BookMarkData *bm)
                                               b, reinterpret_cast<GDestroyNotify>(bookmark_free));
 
                        box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_BUTTON_GAP);
-                       gtk_container_add(GTK_CONTAINER(b->button), box);
+                       gq_gtk_container_add(GTK_WIDGET(b->button), box);
                        gtk_widget_show(box);
 
                        if (b->icon)
@@ -813,7 +813,7 @@ GtkWidget *bookmark_list_new(const gchar *key,
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 
        bm->box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
-       gtk_container_add(GTK_CONTAINER(scrolled), bm->box);
+       gq_gtk_container_add(GTK_WIDGET(scrolled), bm->box);
        gtk_widget_show(bm->box);
 
        bookmark_populate(bm);

diff --git a/src/ui-help.cc b/src/ui-help.cc
index e3f5f7c..2608bbe 100644 (file)
--- a/src/ui-help.cc
+++ b/src/ui-help.cc
@@ -210,7 +210,7 @@ GtkWidget *help_window_new(const gchar *title,
                         G_CALLBACK(help_window_delete_cb), NULL);
 
        vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
-       gtk_container_add(GTK_CONTAINER(window), vbox);
+       gq_gtk_container_add(GTK_WIDGET(window), vbox);
        gtk_widget_show(vbox);
 
        g_object_set_data(G_OBJECT(window), "text_vbox", vbox);
@@ -230,7 +230,7 @@ GtkWidget *help_window_new(const gchar *title,
 
        text = gtk_text_view_new();
        gtk_text_view_set_editable(GTK_TEXT_VIEW(text), FALSE);
-       gtk_container_add(GTK_CONTAINER(scrolled), text);
+       gq_gtk_container_add(GTK_WIDGET(scrolled), text);
        gtk_widget_show(text);
 
        buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
@@ -246,7 +246,7 @@ GtkWidget *help_window_new(const gchar *title,
        button = gtk_button_new_from_icon_name(GQ_ICON_CLOSE, GTK_ICON_SIZE_BUTTON);
        g_signal_connect(G_OBJECT(button), "clicked",
                         G_CALLBACK(help_window_close), window);
-       gtk_container_add(GTK_CONTAINER(hbox), button);
+       gq_gtk_container_add(GTK_WIDGET(hbox), button);
        gtk_widget_set_can_default(button, TRUE);
        gtk_widget_grab_default(button);
        gtk_widget_show(button);

diff --git a/src/ui-misc.cc b/src/ui-misc.cc
index d3271bf..6536cd4 100644 (file)
--- a/src/ui-misc.cc
+++ b/src/ui-misc.cc
@@ -148,7 +148,7 @@ GtkWidget *pref_frame_new(GtkWidget *parent_box, gboolean fill,
                {
                box = gtk_box_new(GTK_ORIENTATION_VERTICAL, padding);
                }
-       gtk_container_add(GTK_CONTAINER(frame), box);
+       gq_gtk_container_add(GTK_WIDGET(frame), box);
        gtk_container_set_border_width(GTK_CONTAINER(box), PREF_PAD_BORDER);
        gtk_widget_show(box);
 
@@ -717,7 +717,7 @@ GtkWidget *pref_toolbar_button(GtkWidget *toolbar,
        gtk_tool_button_set_use_underline(GTK_TOOL_BUTTON(item), TRUE);
 
        if (func) g_signal_connect(item, "clicked", func, data);
-       gtk_container_add(GTK_CONTAINER(toolbar), item);
+       gq_gtk_container_add(GTK_WIDGET(toolbar), item);
        gtk_widget_show(item);
 
        if (description)
@@ -747,7 +747,7 @@ GtkWidget *pref_toolbar_spacer_unused(GtkWidget *toolbar)
        GtkWidget *item;
 
        item = GTK_WIDGET(gtk_separator_tool_item_new());
-       gtk_container_add(GTK_CONTAINER(toolbar), item);
+       gq_gtk_container_add(GTK_WIDGET(toolbar), item);
        gtk_widget_show(item);
 
        return item;
@@ -909,7 +909,7 @@ static void date_selection_popup(DateSelection *ds)
                         G_CALLBACK(date_selection_popup_keypress_cb), ds);
 
        ds->calendar = gtk_calendar_new();
-       gtk_container_add(GTK_CONTAINER(ds->window), ds->calendar);
+       gq_gtk_container_add(GTK_WIDGET(ds->window), ds->calendar);
        gtk_widget_show(ds->calendar);
 
        date = date_selection_get(ds->box);
@@ -1053,7 +1053,7 @@ GtkWidget *date_selection_new()
                         G_CALLBACK(button_size_allocate_cb), ds->spin_y);
 
        icon = gtk_image_new_from_icon_name(GQ_ICON_PAN_DOWN, GTK_ICON_SIZE_BUTTON);
-       gtk_container_add(GTK_CONTAINER(ds->button), icon);
+       gq_gtk_container_add(GTK_WIDGET(ds->button), icon);
        gtk_widget_show(icon);
 
        gq_gtk_box_pack_start(GTK_BOX(ds->box), ds->button, FALSE, FALSE, 0);

diff --git a/src/ui-pathsel.cc b/src/ui-pathsel.cc
index 2668144..d3cb6e3 100644 (file)
--- a/src/ui-pathsel.cc
+++ b/src/ui-pathsel.cc
@@ -1081,7 +1081,7 @@ GtkWidget *path_selection_new_with_files(GtkWidget *entry, const gchar *path,
 #endif
 
        gtk_widget_set_size_request(dd->d_view, DEST_WIDTH, DEST_HEIGHT);
-       gtk_container_add(GTK_CONTAINER(scrolled), dd->d_view);
+       gq_gtk_container_add(GTK_WIDGET(scrolled), dd->d_view);
        gtk_widget_show(dd->d_view);
 
        g_signal_connect(G_OBJECT(dd->d_view), "button_press_event",
@@ -1150,7 +1150,7 @@ GtkWidget *path_selection_new_with_files(GtkWidget *entry, const gchar *path,
                gtk_tree_view_append_column(GTK_TREE_VIEW(dd->f_view), column);
 
                gtk_widget_set_size_request(dd->f_view, DEST_WIDTH, DEST_HEIGHT);
-               gtk_container_add(GTK_CONTAINER(scrolled), dd->f_view);
+               gq_gtk_container_add(GTK_WIDGET(scrolled), dd->f_view);
                gtk_widget_show(dd->f_view);
 
                g_signal_connect(G_OBJECT(dd->f_view), "button_press_event",

diff --git a/src/ui-tree-edit.cc b/src/ui-tree-edit.cc
index 5f4decf..0f796c5 100644 (file)
--- a/src/ui-tree-edit.cc
+++ b/src/ui-tree-edit.cc
@@ -234,7 +234,7 @@ gboolean tree_edit_by_path(GtkTreeView *tree, GtkTreePath *tpath, gint column, c
        ted->entry = gtk_entry_new();
        gtk_entry_set_text(GTK_ENTRY(ted->entry), ted->old_name);
        gtk_editable_select_region(GTK_EDITABLE(ted->entry), 0, strlen(ted->old_name));
-       gtk_container_add(GTK_CONTAINER(ted->window), ted->entry);
+       gq_gtk_container_add(GTK_WIDGET(ted->window), ted->entry);
        gtk_widget_show(ted->entry);
 
        /* due to the fact that gtktreeview scrolls in an idle loop, we cannot

diff --git a/src/ui-utildlg.cc b/src/ui-utildlg.cc
index b750cda..ab2905e 100644 (file)
--- a/src/ui-utildlg.cc
+++ b/src/ui-utildlg.cc
@@ -241,7 +241,7 @@ GtkWidget *generic_dialog_add_button(GenericDialog *gd, const gchar *icon_name,
        gtk_widget_set_can_default(button, TRUE);
        g_object_set_data(G_OBJECT(button), "dialog_function", reinterpret_cast<void *>(func_cb));
 
-       gtk_container_add(GTK_CONTAINER(gd->hbox), button);
+       gq_gtk_container_add(GTK_WIDGET(gd->hbox), button);
 
        alternative_order = generic_dialog_get_alternative_button_order(gd->hbox);
 
@@ -435,8 +435,8 @@ static void generic_dialog_setup(GenericDialog *gd,
        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);
-       gtk_container_add(GTK_CONTAINER(scrolled), vbox);
-       gtk_container_add(GTK_CONTAINER(gd->dialog), scrolled);
+       gq_gtk_container_add(GTK_WIDGET(scrolled), vbox);
+       gq_gtk_container_add(GTK_WIDGET(gd->dialog), scrolled);
        gtk_widget_show(scrolled);
 
        gtk_widget_show(vbox);

diff --git a/src/utilops.cc b/src/utilops.cc
index 44ab796..05ecc1f 100644 (file)
--- a/src/utilops.cc
+++ b/src/utilops.cc
@@ -553,7 +553,7 @@ static GtkWidget *file_util_dialog_add_list(GtkWidget *box, GList *list, gboolea
                }
 
        gtk_widget_set_size_request(view, UTILITY_LIST_MIN_WIDTH, UTILITY_LIST_MIN_HEIGHT);
-       gtk_container_add(GTK_CONTAINER(scrolled), view);
+       gq_gtk_container_add(GTK_WIDGET(scrolled), view);
        gtk_widget_show(view);
 
        while (list)

diff --git a/src/view-file/view-file-icon.cc b/src/view-file/view-file-icon.cc
index 29245cc..32d6955 100644 (file)
--- a/src/view-file/view-file-icon.cc
+++ b/src/view-file/view-file-icon.cc
@@ -353,7 +353,7 @@ static void tip_show(ViewFile *vf)
        label = gtk_label_new(VFICON(vf)->tip_fd->name);
 
        g_object_set_data(G_OBJECT(VFICON(vf)->tip_window), "tip_label", label);
-       gtk_container_add(GTK_CONTAINER(VFICON(vf)->tip_window), label);
+       gq_gtk_container_add(GTK_WIDGET(VFICON(vf)->tip_window), label);
        gtk_widget_show(label);
 
        display = gdk_display_get_default();

diff --git a/src/view-file/view-file.cc b/src/view-file/view-file.cc
index 91f8aeb..b17cde0 100644 (file)
--- a/src/view-file/view-file.cc
+++ b/src/view-file/view-file.cc
@@ -1035,7 +1035,7 @@ static GtkWidget *vf_marks_filter_init(ViewFile *vf)
                gtk_widget_show(check);
                vf->filter_check[i] = check;
                }
-       gtk_container_add(GTK_CONTAINER(frame), hbox);
+       gq_gtk_container_add(GTK_WIDGET(frame), hbox);
        gtk_widget_show(hbox);
        return frame;
 }
@@ -1209,7 +1209,7 @@ static GtkWidget *vf_file_filter_init(ViewFile *vf)
 
        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);
+       gq_gtk_container_add(GTK_WIDGET(frame), hbox);
        gtk_widget_show(hbox);
 
        case_sensitive = gtk_check_button_new_with_label(_("Case"));
@@ -1234,7 +1234,7 @@ static GtkWidget *vf_file_filter_init(ViewFile *vf)
        gtk_widget_set_tooltip_text(GTK_WIDGET(menuitem), _("Select Class filter"));
        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);
+       gq_gtk_container_add(GTK_WIDGET(menuitem), box);
        gq_gtk_widget_show_all(menuitem);
 
        return frame;
@@ -1290,7 +1290,7 @@ ViewFile *vf_new(FileViewType type, FileData *dir_fd)
        g_signal_connect(G_OBJECT(vf->listview), "button_release_event",
                         G_CALLBACK(vf_release_cb), vf);
 
-       gtk_container_add(GTK_CONTAINER(vf->scrolled), vf->listview);
+       gq_gtk_container_add(GTK_WIDGET(vf->scrolled), vf->listview);
        gtk_widget_show(vf->listview);
 
        if (dir_fd) vf_set_fd(vf, dir_fd);