GTK4: gtk_window_set_keep_above()

GTK4 migration

- gtk_window_set_keep_above() Deleted

diff --git a/src/bar.cc b/src/bar.cc
index aad5e80..f1e8c8c 100644 (file)
--- a/src/bar.cc
+++ b/src/bar.cc
@@ -304,7 +304,7 @@ static void bar_expander_height_cb(GtkWidget *, gpointer data)
        window = gtk_window_new(GTK_WINDOW_POPUP);
 
        gtk_window_set_modal(GTK_WINDOW(window), TRUE);
-       gtk_window_set_keep_above(GTK_WINDOW(window), TRUE);
+       gq_gtk_window_set_keep_above(GTK_WINDOW(window), TRUE);
        gtk_window_set_default_size(GTK_WINDOW(window), 50, 30); //** @FIXME set these values in a more sensible way */
 
        gtk_window_move(GTK_WINDOW(window), x, y);

diff --git a/src/collect.cc b/src/collect.cc
index 5652317..59628c2 100644 (file)
--- a/src/collect.cc
+++ b/src/collect.cc
@@ -1342,7 +1342,7 @@ CollectWindow *collection_window_new(const gchar *path)
 
        if (options->collections_on_top)
                {
-               gtk_window_set_keep_above(GTK_WINDOW(cw->window), TRUE);
+               gq_gtk_window_set_keep_above(GTK_WINDOW(cw->window), TRUE);
                }
 
        if (options->save_window_positions && path && collection_load_only_geometry(cw->cd, path))

diff --git a/src/compat.h b/src/compat.h
index fd8b793..eb55ad1 100644 (file)
--- a/src/compat.h
+++ b/src/compat.h
@@ -37,6 +37,7 @@
        #define gq_gtk_scrolled_window_set_shadow_type(scrolled_window, type) gtk_scrolled_window_set_has_frame(scrolled_window, TRUE)
        #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) ;
 #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)
@@ -45,6 +46,7 @@
        #define gq_gtk_scrolled_window_set_shadow_type(scrolled_window, type) gtk_scrolled_window_set_shadow_type(scrolled_window, type)
        #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)
 #endif
 
 #endif /* COMPAT_H */

diff --git a/src/fullscreen.cc b/src/fullscreen.cc
index 5ac0f12..2d70cf0 100644 (file)
--- a/src/fullscreen.cc
+++ b/src/fullscreen.cc
@@ -254,7 +254,7 @@ FullScreenData *fullscreen_start(GtkWidget *window, ImageWindow *imd,
 
        /* keep window above others, if requested */
        if (options->fullscreen.above) {
-               gtk_window_set_keep_above(GTK_WINDOW(fs->window), TRUE);
+               gq_gtk_window_set_keep_above(GTK_WINDOW(fs->window), TRUE);
        }
 
        /* set default size and position, so the window appears where it was before */

diff --git a/src/main.cc b/src/main.cc
index f1d4aa2..3755788 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -564,7 +564,7 @@ static void parse_command_line(gint argc, gchar *argv[])
                        dialog_warning = gtk_message_dialog_new(nullptr, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", "Invalid parameter(s):");
                        gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog_warning), "%s", command_line_errors->str);
                        gtk_window_set_title(GTK_WINDOW(dialog_warning), GQ_APPNAME);
-                       gtk_window_set_keep_above(GTK_WINDOW(dialog_warning), TRUE);
+                       gq_gtk_window_set_keep_above(GTK_WINDOW(dialog_warning), TRUE);
                        gtk_dialog_run(GTK_DIALOG(dialog_warning));
                        gtk_widget_destroy(dialog_warning);
                        g_string_free(command_line_errors, TRUE);
@@ -625,7 +625,7 @@ static void parse_command_line(gint argc, gchar *argv[])
                        dialog_warning = gtk_message_dialog_new(nullptr, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", "Invalid parameter(s):");
                        gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog_warning), "%s", command_line_errors->str);
                        gtk_window_set_title(GTK_WINDOW(dialog_warning), GQ_APPNAME);
-                       gtk_window_set_keep_above(GTK_WINDOW(dialog_warning), TRUE);
+                       gq_gtk_window_set_keep_above(GTK_WINDOW(dialog_warning), TRUE);
                        gtk_dialog_run(GTK_DIALOG(dialog_warning));
                        gtk_widget_destroy(dialog_warning);
                        g_string_free(command_line_errors, TRUE);