From 5c3e4ed2569d80bb102bc15a5eafe3ce13b59903 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Mon, 30 Sep 2002 10:27:34 +0000 Subject: [PATCH] Filter out surplus mouse down event when a double click event is in the queue. This is how MSW does it. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/window.cpp | 21 +++++++++++++++++++++ src/gtk1/window.cpp | 21 +++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index 6411fca957..8fa2da7e91 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -1447,6 +1447,26 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, */ } + // GDK sends surplus button down event + // before a double click event. We + // need to filter these out. + if (gdk_event->type == GDK_BUTTON_PRESS) + { + GdkEvent *peek_event = gdk_event_peek(); + if (peek_event) + { + if (peek_event->type == GDK_2BUTTON_PRESS) + { + gdk_event_free( peek_event ); + return TRUE; + } + else + { + gdk_event_free( peek_event ); + } + } + } + wxEventType event_type = wxEVT_NULL; if (gdk_event->button == 1) @@ -1476,6 +1496,7 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, default: break; } } + if ( event_type == wxEVT_NULL ) { diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index 6411fca957..8fa2da7e91 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -1447,6 +1447,26 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, */ } + // GDK sends surplus button down event + // before a double click event. We + // need to filter these out. + if (gdk_event->type == GDK_BUTTON_PRESS) + { + GdkEvent *peek_event = gdk_event_peek(); + if (peek_event) + { + if (peek_event->type == GDK_2BUTTON_PRESS) + { + gdk_event_free( peek_event ); + return TRUE; + } + else + { + gdk_event_free( peek_event ); + } + } + } + wxEventType event_type = wxEVT_NULL; if (gdk_event->button == 1) @@ -1476,6 +1496,7 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, default: break; } } + if ( event_type == wxEVT_NULL ) {