From 20615934a9d4faf8cd45de56c51357d985461267 Mon Sep 17 00:00:00 2001 From: infirit Date: Sat, 25 Oct 2014 12:35:42 +0200 Subject: Cleanup GTK_CHECK_VERSION and unify where possible gdk_x11_window_lookup_for_display since 2.24 GDK_WINDOW_XID since always gtk_widget_get_visible since 2.18 gtk_widget_set_mapped since 2.20 gdk_event_new since 2.2 gdk_x11_window_lookup_for_display since 2.24 gdk_text_property_to_utf8_list_for_display since 2.2 gtk_widget_get_realized since 2.20 gdk_visual_get_depth since 2.22 gtk_widget_get_window since 2.14 gtk_widget_set_allocation since 2.18 --- src/tools/marco-window-demo.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/tools/marco-window-demo.c') diff --git a/src/tools/marco-window-demo.c b/src/tools/marco-window-demo.c index 7bd1a617..d78d0130 100644 --- a/src/tools/marco-window-demo.c +++ b/src/tools/marco-window-demo.c @@ -24,10 +24,6 @@ #include #include -#if GTK_CHECK_VERSION(3, 0, 0) - #define GDK_WINDOW_XWINDOW(w) GDK_WINDOW_XID(w) -#endif - static GtkWidget* do_appwindow (void); static gboolean aspect_on; @@ -55,7 +51,7 @@ set_gdk_window_struts (GdkWindow *window, vals[11] = 800; XChangeProperty (GDK_WINDOW_XDISPLAY (window), - GDK_WINDOW_XWINDOW (window), + GDK_WINDOW_XID (window), XInternAtom (GDK_WINDOW_XDISPLAY (window), "_NET_WM_STRUT_PARTIAL", False), XA_CARDINAL, 32, PropModeReplace, @@ -122,7 +118,7 @@ set_gdk_window_type (GdkWindow *window, type, False); XChangeProperty (GDK_WINDOW_XDISPLAY (window), - GDK_WINDOW_XWINDOW (window), + GDK_WINDOW_XID (window), XInternAtom (GDK_WINDOW_XDISPLAY (window), "_NET_WM_WINDOW_TYPE", False), XA_ATOM, 32, PropModeReplace, (guchar *)atoms, -- cgit v1.2.1