From b7e07035a360333da31f5c6b593f484d23aa74c2 Mon Sep 17 00:00:00 2001 From: Victor Kareh Date: Thu, 17 Jul 2025 13:19:48 -0400 Subject: ui: replace gtk_widget_get_realized() with gtk_widget_get_mapped() Replace deprecated gtk_widget_get_realized() with gtk_widget_get_mapped(). Since mapped widgets are guaranteed to be realized, and we only care about widget visibility, this change eliminates deprecation warnings while maintaining the same functionality. --- src/tools/marco-window-demo.c | 12 ++++++------ src/ui/frames.c | 2 +- src/ui/resizepopup.c | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/tools/marco-window-demo.c b/src/tools/marco-window-demo.c index 6b001cac..f0eb1b03 100644 --- a/src/tools/marco-window-demo.c +++ b/src/tools/marco-window-demo.c @@ -73,7 +73,7 @@ on_realize_set_struts (GtkWindow *window, widget = GTK_WIDGET (window); - g_return_if_fail (gtk_widget_get_realized (widget)); + g_return_if_fail (gtk_widget_get_mapped (widget)); left = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (window), "meta-strut-left")); right = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (window), "meta-strut-right")); @@ -113,7 +113,7 @@ set_gtk_window_struts (GtkWidget *window, G_CALLBACK (on_realize_set_struts), NULL); - if (gtk_widget_get_realized (widget)) + if (gtk_widget_get_mapped (widget)) set_gdk_window_struts (gtk_widget_get_window (widget), left, right, top, bottom); } @@ -141,7 +141,7 @@ on_realize_set_type (GtkWindow *window, { const char *type; - g_return_if_fail (gtk_widget_get_realized (GTK_WIDGET (window))); + g_return_if_fail (gtk_widget_get_mapped (GTK_WIDGET (window))); type = g_object_get_data (G_OBJECT (window), "meta-window-type"); @@ -170,7 +170,7 @@ set_gtk_window_type (GtkWindow *window, G_CALLBACK (on_realize_set_type), NULL); - if (gtk_widget_get_realized (widget)) + if (gtk_widget_get_mapped (widget)) set_gdk_window_type (gtk_widget_get_window (widget), type); } @@ -189,7 +189,7 @@ on_realize_set_border_only (GtkWindow *window, widget = GTK_WIDGET (window); - g_return_if_fail (gtk_widget_get_realized (widget)); + g_return_if_fail (gtk_widget_get_mapped (widget)); set_gdk_window_border_only (gtk_widget_get_window (widget)); } @@ -210,7 +210,7 @@ GtkWidget *widget; G_CALLBACK (on_realize_set_border_only), NULL); - if (gtk_widget_get_realized (widget)) + if (gtk_widget_get_mapped (widget)) set_gdk_window_border_only (gtk_widget_get_window (widget)); } diff --git a/src/ui/frames.c b/src/ui/frames.c index ad7e10c8..a458fd21 100644 --- a/src/ui/frames.c +++ b/src/ui/frames.c @@ -504,7 +504,7 @@ meta_frames_ensure_layout (MetaFrames *frames, MetaFrameType type; MetaFrameStyle *style; - g_return_if_fail (gtk_widget_get_realized (GTK_WIDGET (frames))); + g_return_if_fail (gtk_widget_get_mapped (GTK_WIDGET (frames))); widget = GTK_WIDGET (frames); diff --git a/src/ui/resizepopup.c b/src/ui/resizepopup.c index 1e57756d..4b416517 100644 --- a/src/ui/resizepopup.c +++ b/src/ui/resizepopup.c @@ -135,7 +135,7 @@ update_size_window (MetaResizePopup *popup) y = y / scale; } - if (gtk_widget_get_realized (popup->size_window)) + if (gtk_widget_get_mapped (popup->size_window)) { /* using move_resize to avoid jumpiness */ gdk_window_move_resize (gtk_widget_get_window (popup->size_window), @@ -157,7 +157,7 @@ sync_showing (MetaResizePopup *popup) if (popup->size_window) gtk_widget_show (popup->size_window); - if (popup->size_window && gtk_widget_get_realized (popup->size_window)) + if (popup->size_window && gtk_widget_get_mapped (popup->size_window)) gdk_window_raise (gtk_widget_get_window(GTK_WIDGET(popup->size_window))); } else -- cgit v1.2.1