summaryrefslogtreecommitdiff
path: root/gdk
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2005-06-26 03:48:06 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2005-06-26 03:48:06 +0000
commit96cf099c4714584a18ca4a9dafa8aabdbc3cebe9 (patch)
tree700e180c0174d2589a51a7afbbb9e4b5ae6bb91d /gdk
parent89ea42aadc4c6ac7bcac461b9c7f92f63365743d (diff)
downloadgtk+-96cf099c4714584a18ca4a9dafa8aabdbc3cebe9.tar.gz
Don't emit grab-broken for overgrabbing, until we figure out how to do
2005-06-25 Matthias Clasen <mclasen@redhat.com> * gdk/x11/gdkmain-x11.c (gdk_keyboard_grab, gdk_pointer_grab): Don't emit grab-broken for overgrabbing, until we figure out how to do that without breaking the menu code.
Diffstat (limited to 'gdk')
-rw-r--r--gdk/x11/gdkmain-x11.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index 92c9f63a6a..3d60d3294a 100644
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -251,9 +251,13 @@ gdk_pointer_grab (GdkWindow * window,
if (return_val == GrabSuccess)
{
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (GDK_WINDOW_DISPLAY (window));
+#if 0
if (display_x11->pointer_xgrab_window != NULL)
- generate_grab_broken_event (GDK_WINDOW (display_x11->pointer_xgrab_window),
- FALSE);
+ {
+ generate_grab_broken_event (GDK_WINDOW (display_x11->pointer_xgrab_window),
+ FALSE);
+ }
+#endif
display_x11->pointer_xgrab_window = (GdkWindowObject *)window;
display_x11->pointer_xgrab_serial = serial;
@@ -352,11 +356,13 @@ gdk_keyboard_grab (GdkWindow * window,
if (return_val == GrabSuccess)
{
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (gdk_drawable_get_display (window));
-
+#if 0
if (display_x11->keyboard_xgrab_window != NULL)
- generate_grab_broken_event (GDK_WINDOW (display_x11->keyboard_xgrab_window),
- TRUE);
-
+ {
+ generate_grab_broken_event (GDK_WINDOW (display_x11->keyboard_xgrab_window),
+ TRUE);
+ }
+#endif
display_x11->keyboard_xgrab_window = (GdkWindowObject *)window;
display_x11->keyboard_xgrab_serial = serial;
display_x11->keyboard_xgrab_owner_events = owner_events;