From 4acce0879941bc85fbcc990ba3fc0d4eacc65f06 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Fri, 16 Nov 2012 07:24:29 +0000 Subject: [PATCH] Remove code that has no effect Adjusting the wxEVT_ENTER_WINDOW mouse position is pointless, execution won't reach that far if gdk_event->window != gtk_widget_get_window(widget), and GetClientAreaOrigin() always returns (0,0). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/window.cpp | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index 17e397ae4c..fd71118964 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -1742,7 +1742,7 @@ wx_window_focus_callback(GtkWidget *widget, //----------------------------------------------------------------------------- static gboolean -gtk_window_enter_callback( GtkWidget *widget, +gtk_window_enter_callback( GtkWidget*, GdkEventCrossing *gdk_event, wxWindowGTK *win ) { @@ -1751,17 +1751,8 @@ gtk_window_enter_callback( GtkWidget *widget, // Event was emitted after a grab if (gdk_event->mode != GDK_CROSSING_NORMAL) return FALSE; - int x = 0; - int y = 0; - GdkModifierType state = (GdkModifierType)0; - - gdk_window_get_pointer(gtk_widget_get_window(widget), &x, &y, &state); - wxMouseEvent event( wxEVT_ENTER_WINDOW ); InitMouseEvent(win, event, gdk_event); - wxPoint pt = win->GetClientAreaOrigin(); - event.m_x = x + pt.x; - event.m_y = y + pt.y; if ( !g_captureWindow ) { @@ -1780,7 +1771,7 @@ gtk_window_enter_callback( GtkWidget *widget, //----------------------------------------------------------------------------- static gboolean -gtk_window_leave_callback( GtkWidget *widget, +gtk_window_leave_callback( GtkWidget*, GdkEventCrossing *gdk_event, wxWindowGTK *win ) { @@ -1790,13 +1781,6 @@ gtk_window_leave_callback( GtkWidget *widget, if (gdk_event->mode != GDK_CROSSING_NORMAL) return FALSE; wxMouseEvent event( wxEVT_LEAVE_WINDOW ); - - int x = 0; - int y = 0; - GdkModifierType state = (GdkModifierType)0; - - gdk_window_get_pointer(gtk_widget_get_window(widget), &x, &y, &state); - InitMouseEvent(win, event, gdk_event); return win->GTKProcessEvent(event); -- 2.50.0