backported changes from gtk/window.cpp 1.679 and dnd.cpp 1.116 checking that the drag and drop is started from a mouse click handler

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-12-03 13:59:27 +00:00
parent 70cf18ef47
commit a9796db88f
2 changed files with 21 additions and 9 deletions

View File

@@ -225,7 +225,8 @@ wxWindowGTK *g_delayedFocus = (wxWindowGTK*) NULL;
// the last click here (extern: used from gtk/menu.cpp)
guint32 wxGtkTimeLastClick = 0;
// Save the last mouse event for drag start
// global variables because GTK+ DnD want to have the
// mouse event that caused it
GdkEvent *g_lastMouseEvent = (GdkEvent*) NULL;
int g_lastButtonNumber = 0;
@@ -1615,8 +1616,10 @@ static gint gtk_window_button_press_callback( GtkWidget *widget,
if (win->GetEventHandler()->ProcessEvent( event ))
{
gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "button_press_event" );
g_lastMouseEvent = NULL;
return TRUE;
}
g_lastMouseEvent = NULL;
if (event_type == wxEVT_RIGHT_DOWN)
{
@@ -1773,13 +1776,15 @@ static gint gtk_window_motion_notify_callback( GtkWidget *widget,
win = FindWindowForMouseEvent(win, event.m_x, event.m_y);
}
if (win->GetEventHandler()->ProcessEvent( event ))
bool ret = win->GetEventHandler()->ProcessEvent( event );
g_lastMouseEvent = NULL;
if ( ret )
{
gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "motion_notify_event" );
return TRUE;
}
return FALSE;
return ret ? TRUE : FALSE;
}
}