Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove code that has no effect

Browse Source 
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
This commit is contained in:
Paul Cornett
2012-11-16 07:24:29 +00:00
parent b77bb705dd
commit 4acce08799
1 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/gtk/window.cpp
View File

@@ -1742,7 +1742,7 @@ wx_window_focus_callback(GtkWidget *widget,
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static gboolean static gboolean
gtk_window_enter_callback( GtkWidget *widget, gtk_window_enter_callback( GtkWidget*,
GdkEventCrossing *gdk_event, GdkEventCrossing *gdk_event,
wxWindowGTK *win ) wxWindowGTK *win )
{ {
@@ -1751,17 +1751,8 @@ gtk_window_enter_callback( GtkWidget *widget,
// Event was emitted after a grab // Event was emitted after a grab
if (gdk_event->mode != GDK_CROSSING_NORMAL) return FALSE; 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 ); wxMouseEvent event( wxEVT_ENTER_WINDOW );
InitMouseEvent(win, event, gdk_event); InitMouseEvent(win, event, gdk_event);
wxPoint pt = win->GetClientAreaOrigin();
event.m_x = x + pt.x;
event.m_y = y + pt.y;
if ( !g_captureWindow ) if ( !g_captureWindow )
{ {
@@ -1780,7 +1771,7 @@ gtk_window_enter_callback( GtkWidget *widget,
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static gboolean static gboolean
gtk_window_leave_callback( GtkWidget *widget, gtk_window_leave_callback( GtkWidget*,
GdkEventCrossing *gdk_event, GdkEventCrossing *gdk_event,
wxWindowGTK *win ) wxWindowGTK *win )
{ {
@@ -1790,13 +1781,6 @@ gtk_window_leave_callback( GtkWidget *widget,
if (gdk_event->mode != GDK_CROSSING_NORMAL) return FALSE; if (gdk_event->mode != GDK_CROSSING_NORMAL) return FALSE;
wxMouseEvent event( wxEVT_LEAVE_WINDOW ); 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); InitMouseEvent(win, event, gdk_event);
return win->GTKProcessEvent(event); return win->GTKProcessEvent(event);