Revert my attempted overly simple fix for #445284, as it causes a
2007-06-25 Tor Lillqvist <tml@novell.com> * gdk/win32/gdkevents-win32.c (gdk_pointer_grab): Revert my attempted overly simple fix for #445284, as it causes a regression. (For instance, in GIMP the tool cursor gets used also for the right-click menu in image windows.) A more complex fix is needed to more completely emulate X11 behaviour. svn path=/trunk/; revision=18225
This commit is contained in:
committed by
Tor Lillqvist
parent
f0d6a8edb8
commit
1d5ef907b2
@ -534,6 +534,8 @@ gdk_pointer_grab (GdkWindow *window,
|
||||
|
||||
if (return_val == GDK_GRAB_SUCCESS)
|
||||
{
|
||||
GdkWindowImplWin32 *impl = GDK_WINDOW_IMPL_WIN32 (((GdkWindowObject *) window)->impl);
|
||||
|
||||
if (p_grab_window != NULL && p_grab_window != window)
|
||||
generate_grab_broken_event (p_grab_window, FALSE, window);
|
||||
|
||||
@ -550,6 +552,10 @@ gdk_pointer_grab (GdkWindow *window,
|
||||
|
||||
if (p_grab_cursor != NULL)
|
||||
SetCursor (p_grab_cursor);
|
||||
else if (impl->hcursor != NULL)
|
||||
SetCursor (impl->hcursor);
|
||||
else
|
||||
SetCursor (LoadCursor (NULL, IDC_ARROW));
|
||||
|
||||
if (confine_to != NULL)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user