Removed surplus enter/leave events after mouse capture/release.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20484 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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;
|
||||
@@ -2069,7 +2072,7 @@ gint gtk_window_enter_callback( GtkWidget *widget,
|
||||
GdkModifierType state = (GdkModifierType)0;
|
||||
|
||||
gdk_window_get_pointer( widget->window, &x, &y, &state );
|
||||
|
||||
|
||||
wxMouseEvent event( wxEVT_ENTER_WINDOW );
|
||||
InitMouseEvent(win, event, gdk_event);
|
||||
wxPoint pt = win->GetClientAreaOrigin();
|
||||
@@ -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 );
|
||||
|
@@ -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;
|
||||
@@ -2069,7 +2072,7 @@ gint gtk_window_enter_callback( GtkWidget *widget,
|
||||
GdkModifierType state = (GdkModifierType)0;
|
||||
|
||||
gdk_window_get_pointer( widget->window, &x, &y, &state );
|
||||
|
||||
|
||||
wxMouseEvent event( wxEVT_ENTER_WINDOW );
|
||||
InitMouseEvent(win, event, gdk_event);
|
||||
wxPoint pt = win->GetClientAreaOrigin();
|
||||
@@ -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 );
|
||||
|
Reference in New Issue
Block a user