diff options
author | Stefano Karapetsas <[email protected]> | 2013-10-26 14:34:04 +0200 |
---|---|---|
committer | Stefano Karapetsas <[email protected]> | 2013-10-26 14:34:04 +0200 |
commit | a6efbbceb5b1122512cd01609eab99fe522d8435 (patch) | |
tree | 43a85aa03fce3f022c5db5f60579daea90cecae3 /mate-panel/panel-xutils.c | |
parent | fa97943c56e331668aff4b3587fe70c5edcd36b2 (diff) | |
download | mate-panel-a6efbbceb5b1122512cd01609eab99fe522d8435.tar.bz2 mate-panel-a6efbbceb5b1122512cd01609eab99fe522d8435.tar.xz |
mate-panel: Add GTK3 support
Diffstat (limited to 'mate-panel/panel-xutils.c')
-rw-r--r-- | mate-panel/panel-xutils.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/mate-panel/panel-xutils.c b/mate-panel/panel-xutils.c index 14b57632..e970fb37 100644 --- a/mate-panel/panel-xutils.c +++ b/mate-panel/panel-xutils.c @@ -27,6 +27,7 @@ #include "panel-xutils.h" #include <glib.h> +#include <gtk/gtk.h> #include <gdk/gdk.h> #include <gdk/gdkx.h> #include <X11/Xlib.h> @@ -50,7 +51,11 @@ 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, @@ -113,7 +118,11 @@ 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); @@ -164,7 +173,11 @@ 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); |