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

Fix X server hang in DND.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43422 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2006-11-14 21:19:52 +00:00
parent 9fb599edba
commit 8f9850dd77
2 changed files with 21 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gtk/window.cpp
View File

@@ -210,6 +210,10 @@ wxWindowGTK *g_focusWindowLast = (wxWindowGTK*) NULL;
// yet, defer setting the focus to idle time.
wxWindowGTK *g_delayedFocus = (wxWindowGTK*) NULL;
// Save the last mouse event for drag start
GdkEvent *g_lastMouseEvent = (GdkEvent*) NULL;
int g_lastButtonNumber = 0;
extern bool g_mainThreadLocked;
//-----------------------------------------------------------------------------
@@ -1462,6 +1466,8 @@ gtk_window_button_press_callback( GtkWidget *widget,
{
wxCOMMON_CALLBACK_PROLOGUE(gdk_event, win);
g_lastButtonNumber = gdk_event->button;
if (win->m_wxwindow && (g_focusWindow != win) && win->AcceptsFocus())
{
gtk_widget_grab_focus( win->m_wxwindow );
@@ -1578,6 +1584,8 @@ gtk_window_button_press_callback( GtkWidget *widget,
return FALSE;
}
g_lastMouseEvent = (GdkEvent*) gdk_event;
wxMouseEvent event( event_type );
InitMouseEvent( win, event, gdk_event );
@@ -1633,6 +1641,8 @@ gtk_window_button_release_callback( GtkWidget *widget,
{
wxCOMMON_CALLBACK_PROLOGUE(gdk_event, win);
g_lastButtonNumber = 0;
wxEventType event_type = wxEVT_NULL;
switch (gdk_event->button)
@@ -1654,6 +1664,8 @@ gtk_window_button_release_callback( GtkWidget *widget,
return FALSE;
}
g_lastMouseEvent = (GdkEvent*) gdk_event;
wxMouseEvent event( event_type );
InitMouseEvent( win, event, gdk_event );
@@ -1693,6 +1705,8 @@ gtk_window_motion_notify_callback( GtkWidget *widget,
gdk_event->y = y;
}
g_lastMouseEvent = (GdkEvent*) gdk_event;
wxMouseEvent event( wxEVT_MOTION );
InitMouseEvent(win, event, gdk_event);