Merge from trunk:

2007-06-10  Cody Russell  <bratsche@gnome.org>

        Merge from trunk:

        * gdk/win32/gdkevents-win32.c (gdk_pointer_grab):
        Don't revert the mouse cursor to the built-in one when
        the user holds the mouse button down. (#445284, Tor Lillqvist)


svn path=/branches/gtk-2-10/; revision=18094
This commit is contained in:
Cody Russell
2007-06-10 16:13:49 +00:00
committed by Cody Russell
parent 2379e6b124
commit d71a6044ac
2 changed files with 8 additions and 6 deletions

View File

@@ -1,3 +1,11 @@
2007-06-10 Cody Russell <bratsche@gnome.org>
Merge from trunk:
* gdk/win32/gdkevents-win32.c (gdk_pointer_grab):
Don't revert the mouse cursor to the built-in one when
the user holds the mouse button down. (#445284, Tor Lillqvist)
2007-06-09 Matthias Clasen <mclasen@redhat.com>
Merge from trunk:

View File

@@ -588,8 +588,6 @@ 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);
@@ -606,10 +604,6 @@ 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)
{