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/panel-xutils.c | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'mate-panel/panel-xutils.c') diff --git a/mate-panel/panel-xutils.c b/mate-panel/panel-xutils.c index ccf68116..34e851fd 100644 --- a/mate-panel/panel-xutils.c +++ b/mate-panel/panel-xutils.c @@ -51,11 +51,7 @@ panel_xutils_set_window_type (GdkWindow *gdk_window, g_return_if_fail (GDK_IS_WINDOW (gdk_window)); display = GDK_WINDOW_XDISPLAY (gdk_window); -#if GTK_CHECK_VERSION (3, 0, 0) window = GDK_WINDOW_XID (gdk_window); -#else - window = GDK_WINDOW_XWINDOW (gdk_window); -#endif if (net_wm_window_type == None) net_wm_window_type = XInternAtom (display, @@ -122,11 +118,7 @@ panel_xutils_set_strut (GdkWindow *gdk_window, g_return_if_fail (GDK_IS_WINDOW (gdk_window)); display = GDK_WINDOW_XDISPLAY (gdk_window); -#if GTK_CHECK_VERSION (3, 0, 0) window = GDK_WINDOW_XID (gdk_window); -#else - window = GDK_WINDOW_XWINDOW (gdk_window); -#endif if (net_wm_strut == None) net_wm_strut = XInternAtom (display, "_NET_WM_STRUT", False); @@ -181,11 +173,7 @@ panel_warp_pointer (GdkWindow *gdk_window, g_return_if_fail (GDK_IS_WINDOW (gdk_window)); display = GDK_WINDOW_XDISPLAY (gdk_window); -#if GTK_CHECK_VERSION (3, 0, 0) window = GDK_WINDOW_XID (gdk_window); -#else - window = GDK_WINDOW_XWINDOW (gdk_window); -#endif gdk_error_trap_push (); XWarpPointer (display, None, window, 0, 0, 0, 0, x, y); -- cgit v1.2.1