During drag and drop, set the event mask at ButtonPress time to include

1998-04-08  Miguel de Icaza  <miguel@nuclecu.unam.mx>

	* gdk/gdk.c (gdk_event_translate): During drag and drop, set the
	event mask at ButtonPress time to include ButtonPressMask and
	ButtonReleaseMask, otherwise, if the button is released, and we
	get a LeaveNotify event, it still thinks we are doing a drag.

9 files changed, 51 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 1190822ff0..2eb4bc17ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1998-04-08  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* gdk/gdk.c (gdk_event_translate): During drag and drop, set the
+	event mask at ButtonPress time to include ButtonPressMask and
+	ButtonReleaseMask, otherwise, if the button is released, and we
+	get a LeaveNotify event, it still thinks we are doing a drag.
+
 Tue Apr  7 22:45:37 PDT 1998 Shawn T. Amundson <amundson@gtk.org>
 
 	* Released GTK+ 0.99.10
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 1190822ff0..2eb4bc17ed 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+1998-04-08  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* gdk/gdk.c (gdk_event_translate): During drag and drop, set the
+	event mask at ButtonPress time to include ButtonPressMask and
+	ButtonReleaseMask, otherwise, if the button is released, and we
+	get a LeaveNotify event, it still thinks we are doing a drag.
+
 Tue Apr  7 22:45:37 PDT 1998 Shawn T. Amundson <amundson@gtk.org>
 
 	* Released GTK+ 0.99.10
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1190822ff0..2eb4bc17ed 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+1998-04-08  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* gdk/gdk.c (gdk_event_translate): During drag and drop, set the
+	event mask at ButtonPress time to include ButtonPressMask and
+	ButtonReleaseMask, otherwise, if the button is released, and we
+	get a LeaveNotify event, it still thinks we are doing a drag.
+
 Tue Apr  7 22:45:37 PDT 1998 Shawn T. Amundson <amundson@gtk.org>
 
 	* Released GTK+ 0.99.10
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 1190822ff0..2eb4bc17ed 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+1998-04-08  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* gdk/gdk.c (gdk_event_translate): During drag and drop, set the
+	event mask at ButtonPress time to include ButtonPressMask and
+	ButtonReleaseMask, otherwise, if the button is released, and we
+	get a LeaveNotify event, it still thinks we are doing a drag.
+
 Tue Apr  7 22:45:37 PDT 1998 Shawn T. Amundson <amundson@gtk.org>
 
 	* Released GTK+ 0.99.10
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 1190822ff0..2eb4bc17ed 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+1998-04-08  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* gdk/gdk.c (gdk_event_translate): During drag and drop, set the
+	event mask at ButtonPress time to include ButtonPressMask and
+	ButtonReleaseMask, otherwise, if the button is released, and we
+	get a LeaveNotify event, it still thinks we are doing a drag.
+
 Tue Apr  7 22:45:37 PDT 1998 Shawn T. Amundson <amundson@gtk.org>
 
 	* Released GTK+ 0.99.10
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 1190822ff0..2eb4bc17ed 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+1998-04-08  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* gdk/gdk.c (gdk_event_translate): During drag and drop, set the
+	event mask at ButtonPress time to include ButtonPressMask and
+	ButtonReleaseMask, otherwise, if the button is released, and we
+	get a LeaveNotify event, it still thinks we are doing a drag.
+
 Tue Apr  7 22:45:37 PDT 1998 Shawn T. Amundson <amundson@gtk.org>
 
 	* Released GTK+ 0.99.10
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 1190822ff0..2eb4bc17ed 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+1998-04-08  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* gdk/gdk.c (gdk_event_translate): During drag and drop, set the
+	event mask at ButtonPress time to include ButtonPressMask and
+	ButtonReleaseMask, otherwise, if the button is released, and we
+	get a LeaveNotify event, it still thinks we are doing a drag.
+
 Tue Apr  7 22:45:37 PDT 1998 Shawn T. Amundson <amundson@gtk.org>
 
 	* Released GTK+ 0.99.10
diff --git a/gdk/gdk.c b/gdk/gdk.c
index 6d5ae500b8..323c737915 100644
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -1965,7 +1965,7 @@ gdk_event_translate (GdkEvent *event,
 	    
 	    window_private->dnd_drag_savedeventmask = dnd_winattr.your_event_mask;
 	    dnd_setwinattr.event_mask = 
-	      window_private->dnd_drag_eventmask = ButtonMotionMask |
+	      window_private->dnd_drag_eventmask = ButtonMotionMask | ButtonPressMask | ButtonReleaseMask |
 			EnterWindowMask | LeaveWindowMask;
 	    XChangeWindowAttributes(gdk_display, window_private->xwindow,
 				    CWEventMask, &dnd_setwinattr);
diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index 6d5ae500b8..323c737915 100644
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -1965,7 +1965,7 @@ gdk_event_translate (GdkEvent *event,
 	    
 	    window_private->dnd_drag_savedeventmask = dnd_winattr.your_event_mask;
 	    dnd_setwinattr.event_mask = 
-	      window_private->dnd_drag_eventmask = ButtonMotionMask |
+	      window_private->dnd_drag_eventmask = ButtonMotionMask | ButtonPressMask | ButtonReleaseMask |
 			EnterWindowMask | LeaveWindowMask;
 	    XChangeWindowAttributes(gdk_display, window_private->xwindow,
 				    CWEventMask, &dnd_setwinattr);