From 41ff2a970ebee68fc7ca335f10ae24a6210d1fd5 Mon Sep 17 00:00:00 2001 From: infirit Date: Fri, 16 May 2014 16:28:11 +0200 Subject: Use GDK_WINDOW_XID for gtk+2 and gtk+3 It was introduced in gdk2 already so clean up the code. --- mate-panel/xstuff.c | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'mate-panel/xstuff.c') diff --git a/mate-panel/xstuff.c b/mate-panel/xstuff.c index d31f6d97..8c375deb 100644 --- a/mate-panel/xstuff.c +++ b/mate-panel/xstuff.c @@ -163,11 +163,7 @@ xstuff_is_compliant_wm (void) int size; xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); -#if GTK_CHECK_VERSION (3, 0, 0) root_window = GDK_WINDOW_XID (gdk_get_default_root_window ()); -#else - root_window = GDK_WINDOW_XWINDOW (gdk_get_default_root_window ()); -#endif /* FIXME this is totally broken; should be using * gdk_net_wm_supports() on particular hints when we rely @@ -215,11 +211,7 @@ xstuff_set_pos_size (GdkWindow *window, int x, int y, int w, int h) gdk_error_trap_push (); XSetWMNormalHints (GDK_WINDOW_XDISPLAY (window), -#if GTK_CHECK_VERSION (3, 0, 0) GDK_WINDOW_XID (window), -#else - GDK_WINDOW_XWINDOW (window), -#endif &size_hints); gdk_window_move_resize (window, x, y, w, h); @@ -251,11 +243,7 @@ xstuff_set_wmspec_dock_hints (GdkWindow *window, } XChangeProperty (GDK_WINDOW_XDISPLAY (window), -#if GTK_CHECK_VERSION (3, 0, 0) GDK_WINDOW_XID (window), -#else - GDK_WINDOW_XWINDOW (window), -#endif panel_atom_get ("_NET_WM_WINDOW_TYPE"), XA_ATOM, 32, PropModeReplace, (unsigned char *) atoms, @@ -277,11 +265,7 @@ xstuff_set_wmspec_strut (GdkWindow *window, vals [3] = bottom; XChangeProperty (GDK_WINDOW_XDISPLAY (window), -#if GTK_CHECK_VERSION (3, 0, 0) GDK_WINDOW_XID (window), -#else - GDK_WINDOW_XWINDOW (window), -#endif panel_atom_get ("_NET_WM_STRUT"), XA_CARDINAL, 32, PropModeReplace, (unsigned char *) vals, 4); @@ -291,11 +275,7 @@ void xstuff_delete_property (GdkWindow *window, const char *name) { Display *xdisplay = GDK_WINDOW_XDISPLAY (window); -#if GTK_CHECK_VERSION (3, 0, 0) Window xwindow = GDK_WINDOW_XID (window); -#else - Window xwindow = GDK_WINDOW_XWINDOW (window); -#endif XDeleteProperty (xdisplay, xwindow, panel_atom_get (name)); -- cgit v1.2.1