GTK4: gtk_frame_set_shadow_type()

GTK4 migration
- gtk_frame_set_shadow_type() is deleted

diff --git a/src/bar-gps.cc b/src/bar-gps.cc
index c12afb0..e323b29 100644 (file)
--- a/src/bar-gps.cc
+++ b/src/bar-gps.cc
@@ -988,7 +988,7 @@ GtkWidget *bar_pane_gps_new(const gchar *id, const gchar *title, const gchar *ma
        g_object_set_data(G_OBJECT(pgd->widget), "pane_data", pgd);
        g_signal_connect(G_OBJECT(pgd->widget), "destroy", G_CALLBACK(bar_pane_gps_destroy), pgd);
 
-       gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
+       gq_gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
 
        gtk_widget_set_size_request(pgd->widget, -1, height);
 

diff --git a/src/collect.cc b/src/collect.cc
index d0d906d..5652317 100644 (file)
--- a/src/collect.cc
+++ b/src/collect.cc
@@ -1379,7 +1379,7 @@ CollectWindow *collection_window_new(const gchar *path)
 
        frame = gtk_frame_new(nullptr);
        DEBUG_NAME(frame);
-       gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
+       gq_gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
        gq_gtk_box_pack_start(GTK_BOX(cw->status_box), frame, TRUE, TRUE, 0);
        gtk_widget_show(frame);
 

diff --git a/src/compat.h b/src/compat.h
index a6808c2..c7e773b 100644 (file)
--- a/src/compat.h
+++ b/src/compat.h
@@ -32,12 +32,14 @@
 #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_frame_set_shadow_type(frame, type) ;
        #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_frame_set_shadow_type(frame, type) gtk_frame_set_shadow_type(frame, type)
        #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)

diff --git a/src/dupe.cc b/src/dupe.cc
index eb39b25..60775af 100644 (file)
--- a/src/dupe.cc
+++ b/src/dupe.cc
@@ -4722,7 +4722,7 @@ DupeWindow *dupe_window_new()
 
        frame = gtk_frame_new(nullptr);
        DEBUG_NAME(frame);
-       gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
+       gq_gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
        gq_gtk_box_pack_start(GTK_BOX(status_box), frame, TRUE, TRUE, 0);
        gtk_widget_show(frame);
 

diff --git a/src/image.cc b/src/image.cc
index af609b0..34c9d6f 100644 (file)
--- a/src/image.cc
+++ b/src/image.cc
@@ -2014,7 +2014,7 @@ void image_set_selectable(ImageWindow *imd, gboolean selectable)
 {
        if (!imd->has_frame) return;
 
-       gtk_frame_set_shadow_type(GTK_FRAME(imd->frame), GTK_SHADOW_NONE);
+       gq_gtk_frame_set_shadow_type(GTK_FRAME(imd->frame), GTK_SHADOW_NONE);
        gtk_container_set_border_width(GTK_CONTAINER(imd->frame), selectable ? 4 : 0);
 }
 

diff --git a/src/layout.cc b/src/layout.cc
index 95a962e..cb539bf 100644 (file)
--- a/src/layout.cc
+++ b/src/layout.cc
@@ -475,7 +475,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);
+       gq_gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
        gq_gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 0);
        gtk_widget_show(frame);
 
@@ -571,7 +571,7 @@ static GtkWidget *layout_zoom_button(LayoutWindow *lw, GtkWidget *box, gint size
        frame = gtk_frame_new(nullptr);
        DEBUG_NAME(frame);
        if (size) gtk_widget_set_size_request(frame, size, -1);
-       gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
+       gq_gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
 
        gq_gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 0);
 
@@ -799,7 +799,7 @@ static GtkWidget *layout_status_label(gchar *text, GtkWidget *box, gboolean star
        frame = gtk_frame_new(nullptr);
        DEBUG_NAME(frame);
        if (size) gtk_widget_set_size_request(frame, size, -1);
-       gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
+       gq_gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
        if (start)
                {
                gq_gtk_box_pack_start(GTK_BOX(box), frame, expand, expand, 0);
@@ -882,7 +882,7 @@ static void layout_status_setup(LayoutWindow *lw, GtkWidget *box, gboolean small
 
        toolbar_frame = gtk_frame_new(nullptr);
        DEBUG_NAME(toolbar_frame);
-       gtk_frame_set_shadow_type(GTK_FRAME(toolbar_frame), GTK_SHADOW_IN);
+       gq_gtk_frame_set_shadow_type(GTK_FRAME(toolbar_frame), GTK_SHADOW_IN);
        gtk_container_add(GTK_CONTAINER(toolbar_frame), toolbar);
        gtk_widget_show(toolbar_frame);
        gtk_widget_show(toolbar);

diff --git a/src/pan-view/pan-view.cc b/src/pan-view/pan-view.cc
index c6111b8..c98f7f4 100644 (file)
--- a/src/pan-view/pan-view.cc
+++ b/src/pan-view/pan-view.cc
@@ -1934,7 +1934,7 @@ static void pan_window_new_real(FileData *dir_fd)
 
        frame = gtk_frame_new(nullptr);
        DEBUG_NAME(frame);
-       gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
+       gq_gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
        gtk_widget_set_size_request(frame, ZOOM_LABEL_WIDTH, -1);
        gq_gtk_box_pack_start(GTK_BOX(box), frame, TRUE, TRUE, 0);
        gtk_widget_show(frame);
@@ -1948,7 +1948,7 @@ static void pan_window_new_real(FileData *dir_fd)
 
        frame = gtk_frame_new(nullptr);
        DEBUG_NAME(frame);
-       gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
+       gq_gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
        gtk_widget_set_size_request(frame, ZOOM_LABEL_WIDTH, -1);
        gq_gtk_box_pack_end(GTK_BOX(box), frame, FALSE, FALSE, 0);
        gtk_widget_show(frame);

diff --git a/src/search.cc b/src/search.cc
index b25e965..2dc9169 100644 (file)
--- a/src/search.cc
+++ b/src/search.cc
@@ -3679,7 +3679,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);
+       gq_gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
        gq_gtk_box_pack_start(GTK_BOX(hbox), frame, TRUE, TRUE, PREF_PAD_SPACE);
        gtk_widget_show(frame);