diff options
| author | Tor Lillqvist <tml@novell.com> | 2007-06-25 06:38:58 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2007-06-25 06:38:58 +0000 |
| commit | 1d5ef907b279e087156e61f8f19350d9aff4ab76 (patch) | |
| tree | 8cff3b6148583b3889d1838ba1a7f207fc52564d /gdk/win32 | |
| parent | f0d6a8edb809f17a9ea7398f217e7861ceb439ed (diff) | |
| download | gtk+-1d5ef907b279e087156e61f8f19350d9aff4ab76.tar.gz | |
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
Diffstat (limited to 'gdk/win32')
| -rw-r--r-- | gdk/win32/gdkevents-win32.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c index 9364d15514..5059a88993 100644 --- a/gdk/win32/gdkevents-win32.c +++ b/gdk/win32/gdkevents-win32.c @@ -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) { |