From 7f5f144a8143f02841ef9fa4662e25ef24038054 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Mon, 5 May 2003 08:42:22 +0000 Subject: [PATCH] Upported fix to mouse capture event handling. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/window.cpp | 6 ++++++ src/gtk1/window.cpp | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index 2a66dac87f..538dda645d 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -2062,6 +2062,9 @@ gint gtk_window_enter_callback( GtkWidget *widget, if (!win->m_hasVMT) return FALSE; if (g_blockEventsOnDrag) return FALSE; + // Event was emitted after a grab + if (gdk_event->mode != GDK_CROSSING_NORMAL) return FALSE; + if (!win->IsOwnGtkWindow( gdk_event->window )) return FALSE; int x = 0; @@ -2099,6 +2102,9 @@ static gint gtk_window_leave_callback( GtkWidget *widget, GdkEventCrossing *gdk_ if (!win->m_hasVMT) return FALSE; if (g_blockEventsOnDrag) return FALSE; + // Event was emitted after an ungrab + if (gdk_event->mode != GDK_CROSSING_NORMAL) return FALSE; + if (!win->IsOwnGtkWindow( gdk_event->window )) return FALSE; wxMouseEvent event( wxEVT_LEAVE_WINDOW ); diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index 2a66dac87f..538dda645d 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -2062,6 +2062,9 @@ gint gtk_window_enter_callback( GtkWidget *widget, if (!win->m_hasVMT) return FALSE; if (g_blockEventsOnDrag) return FALSE; + // Event was emitted after a grab + if (gdk_event->mode != GDK_CROSSING_NORMAL) return FALSE; + if (!win->IsOwnGtkWindow( gdk_event->window )) return FALSE; int x = 0; @@ -2099,6 +2102,9 @@ static gint gtk_window_leave_callback( GtkWidget *widget, GdkEventCrossing *gdk_ if (!win->m_hasVMT) return FALSE; if (g_blockEventsOnDrag) return FALSE; + // Event was emitted after an ungrab + if (gdk_event->mode != GDK_CROSSING_NORMAL) return FALSE; + if (!win->IsOwnGtkWindow( gdk_event->window )) return FALSE; wxMouseEvent event( wxEVT_LEAVE_WINDOW ); -- 2.49.0