fix for wxMouseEvent::LeftUp() from Stefan.Neis@t-online.de
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1972,22 +1972,6 @@ static void wxCanvasInputEvent(Widget drawingArea,
|
|||||||
else if (local_event.xany.type == MotionNotify)
|
else if (local_event.xany.type == MotionNotify)
|
||||||
{
|
{
|
||||||
eventType = wxEVT_MOTION;
|
eventType = wxEVT_MOTION;
|
||||||
if (local_event.xmotion.is_hint == NotifyHint)
|
|
||||||
{
|
|
||||||
Window root, child;
|
|
||||||
Display *dpy = XtDisplay (drawingArea);
|
|
||||||
|
|
||||||
XQueryPointer (dpy, XtWindow (drawingArea),
|
|
||||||
&root, &child,
|
|
||||||
&local_event.xmotion.x_root,
|
|
||||||
&local_event.xmotion.y_root,
|
|
||||||
&local_event.xmotion.x,
|
|
||||||
&local_event.xmotion.y,
|
|
||||||
&local_event.xmotion.state);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
else if (local_event.xany.type == ButtonPress)
|
else if (local_event.xany.type == ButtonPress)
|
||||||
@@ -2045,6 +2029,26 @@ static void wxCanvasInputEvent(Widget drawingArea,
|
|||||||
wxevent.m_metaDown = local_event.xbutton.state & Mod1Mask;
|
wxevent.m_metaDown = local_event.xbutton.state & Mod1Mask;
|
||||||
wxevent.SetTimestamp(local_event.xbutton.time);
|
wxevent.SetTimestamp(local_event.xbutton.time);
|
||||||
|
|
||||||
|
if (eventType = wxEVT_MOTION)
|
||||||
|
{
|
||||||
|
if (local_event.xmotion.is_hint == NotifyHint)
|
||||||
|
{
|
||||||
|
Window root, child;
|
||||||
|
Display *dpy = XtDisplay (drawingArea);
|
||||||
|
|
||||||
|
XQueryPointer (dpy, XtWindow (drawingArea),
|
||||||
|
&root, &child,
|
||||||
|
&local_event.xmotion.x_root,
|
||||||
|
&local_event.xmotion.y_root,
|
||||||
|
&local_event.xmotion.x,
|
||||||
|
&local_event.xmotion.y,
|
||||||
|
&local_event.xmotion.state);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Now check if we need to translate this event into a double click
|
// Now check if we need to translate this event into a double click
|
||||||
if (TRUE) // canvas->doubleClickAllowed)
|
if (TRUE) // canvas->doubleClickAllowed)
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user