callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Patch from George Liebl to add a GdkGrabStatus enumeration to use as a

Browse Source 
Thu Jul  6 11:54:03 2000  Owen Taylor  <otaylor@redhat.com>

	* gdk/gdk.h gdk/gdktypes.h gdk/linux-fb/gdkmain-fb.c
	gdk/nanox/gdkmain-nanox.c gdk/win32/gdkevents-win32.c
	gdk/win32/gdkinput-win32.c gdk/win32/gdkwin32.h
	gdk/x11/gdkmain-x11.c:

	Patch from George Liebl to add a GdkGrabStatus enumeration to use
	as a return value of gdk_*_grab(). Previously, we just
	returned the X11 values directly.
This commit is contained in:
Owen Taylor
2000-07-06 16:20:45 +00:00
committed by Owen Taylor
parent f60e216527
commit 0611f06b5a
16 changed files with 156 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
gdk/win32/gdkevents-win32.c
View File

@ -472,7 +472,7 @@ event_mask_string (GdkEventMask mask)
*--------------------------------------------------------------
*/
gint
GdkGrabStatus
gdk_pointer_grab (GdkWindow * window,
gboolean owner_events,
GdkEventMask event_mask,
@ -511,9 +511,9 @@ gdk_pointer_grab (GdkWindow * window,
confine_to,
time);
else
return_val = Success;
return_val = GDK_GRAB_SUCCESS;
if (return_val == Success)
if (return_val == GDK_GRAB_SUCCESS)
{
if (!GDK_DRAWABLE_DESTROYED (window))
{
@ -531,13 +531,13 @@ gdk_pointer_grab (GdkWindow * window,
*/
SetCapture (xwindow);
#endif
return_val = GrabSuccess;
return_val = GDK_GRAB_SUCCESS;
}
else
return_val = AlreadyGrabbed;
return_val = GDK_GRAB_ALREADY_GRABBED;
}
if (return_val == GrabSuccess)
if (return_val == GDK_GRAB_SUCCESS)
{
p_grab_window = window;
p_grab_cursor = xcursor;
@ -616,7 +616,7 @@ gdk_pointer_is_grabbed (void)
*--------------------------------------------------------------
*/
gint
GdkGrabStatus
gdk_keyboard_grab (GdkWindow * window,
gboolean owner_events,
guint32 time)
@ -632,12 +632,12 @@ gdk_keyboard_grab (GdkWindow * window,
if (!GDK_DRAWABLE_DESTROYED (window))
{
k_grab_owner_events = owner_events != 0;
return_val = GrabSuccess;
return_val = GDK_GRAB_SUCCESS;
}
else
return_val = AlreadyGrabbed;
return_val = GDK_GRAB_ALREADY_GRABBED;
if (return_val == GrabSuccess)
if (return_val == GDK_GRAB_SUCCESS)
k_grab_window = window;
return return_val;