Set the cursor in all cases. If no grab cursor specified, use the grabbing

2004-02-02  Tor Lillqvist  <tml@iki.fi>

	* gdk/win32/gdkevents-win32.c (gdk_pointer_grab): Set the cursor
	in all cases. If no grab cursor specified, use the grabbing
	window's cursor. If the grabbing window has no cursor, use the
	default arrow cursor. (#118025)
This commit is contained in:
Tor Lillqvist 2004-02-02 22:26:15 +00:00 committed by Tor Lillqvist
parent 6eb2fe94cb
commit db2440ed55
6 changed files with 40 additions and 0 deletions

View File

@ -1,3 +1,10 @@
2004-02-02 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkevents-win32.c (gdk_pointer_grab): Set the cursor
in all cases. If no grab cursor specified, use the grabbing
window's cursor. If the grabbing window has no cursor, use the
default arrow cursor. (#118025)
Mon Feb 2 22:05:36 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkseparatormenuitem.c (gtk_separator_menu_item_init): The

View File

@ -1,3 +1,10 @@
2004-02-02 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkevents-win32.c (gdk_pointer_grab): Set the cursor
in all cases. If no grab cursor specified, use the grabbing
window's cursor. If the grabbing window has no cursor, use the
default arrow cursor. (#118025)
Mon Feb 2 22:05:36 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkseparatormenuitem.c (gtk_separator_menu_item_init): The

View File

@ -1,3 +1,10 @@
2004-02-02 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkevents-win32.c (gdk_pointer_grab): Set the cursor
in all cases. If no grab cursor specified, use the grabbing
window's cursor. If the grabbing window has no cursor, use the
default arrow cursor. (#118025)
Mon Feb 2 22:05:36 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkseparatormenuitem.c (gtk_separator_menu_item_init): The

View File

@ -1,3 +1,10 @@
2004-02-02 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkevents-win32.c (gdk_pointer_grab): Set the cursor
in all cases. If no grab cursor specified, use the grabbing
window's cursor. If the grabbing window has no cursor, use the
default arrow cursor. (#118025)
Mon Feb 2 22:05:36 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkseparatormenuitem.c (gtk_separator_menu_item_init): The

View File

@ -1,3 +1,10 @@
2004-02-02 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkevents-win32.c (gdk_pointer_grab): Set the cursor
in all cases. If no grab cursor specified, use the grabbing
window's cursor. If the grabbing window has no cursor, use the
default arrow cursor. (#118025)
Mon Feb 2 22:05:36 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkseparatormenuitem.c (gtk_separator_menu_item_init): The

View File

@ -560,6 +560,7 @@ gdk_pointer_grab (GdkWindow *window,
if (return_val == GDK_GRAB_SUCCESS)
{
GdkWindowImplWin32 *impl = GDK_WINDOW_IMPL_WIN32 (((GdkWindowObject *) window)->impl);
p_grab_window = window;
if (p_grab_cursor != NULL)
@ -573,6 +574,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)
{