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

Bug #107664 continued:

Browse Source 
2003-03-08  Matthias Clasen  <maclas@gmx.de>

	Bug #107664 continued:

	* gdk/x11/gdkinputprivate.h:
	* gdk/x11/gdkinput-none.c (_gdk_input_window_none_event): Remove.
	(_gdk_input_other_event): Return gboolean.
	* gdk/x11/gdkinput-xfree.c (_gdk_input_window_none_event): Remove.
	(_gdk_input_other_event): Return gboolean.
	* gdk/x11/gdkinput-x11.c (_gdk_input_common_other_event): Return gboolean.

	* gdk/x11/gdkevents-x11.c (gdk_event_translate): Make return_val
	gboolean, remove pointless call to _gdk_input_window_none_event.

	* gdk/win32/gdkinput-win32.[hc] (_gdk_input_other_event): Return gboolean.
	(_gdk_input_window_none_event): Remove.

	* gtk/gtktextiter.c (_gtk_text_iter_get_indexable_segment):
	(_gtk_text_iter_get_any_segment):
	(_gtk_text_iter_get_segment_byte):
	(_gtk_text_iter_get_segment_char):
	(_gtk_text_iter_get_text_line):
	(_gtk_text_iter_get_btree): Fix 0/NULL confusion.
	* gdk/x11/gdkdnd-x11.c (motif_target_table_check): Return gint.
	* gdk/win32/gdkfont-win32.c (gdk_font_equal):
	* gdk/linux-fb/gdkwindow-fb.c (gdk_window_get_deskrelative_origin):
	(gdk_window_get_origin):
	* gdk/linux-fb/gdkcolor-fb.c (gdk_colors_alloc): Fix 0/FALSE confusion.
This commit is contained in:
Matthias Clasen
2003-03-08 21:11:39 +00:00
committed by Matthias Clasen
parent d03b2741ad
commit 3db24eb81c
12 changed files with 88 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gdk/x11/gdkinput-xfree.c
View File

@ -178,7 +178,7 @@ _gdk_input_enter_event (XCrossingEvent *xevent,
input_window->root_y = root_y;
}
gint
gboolean
_gdk_input_other_event (GdkEvent *event,
XEvent *xevent,
GdkWindow *window)
@ -190,7 +190,7 @@ _gdk_input_other_event (GdkEvent *event,
GdkDisplayX11 *display_impl = GDK_DISPLAY_X11 (GDK_WINDOW_DISPLAY (window));
input_window = _gdk_input_window_find(window);
g_return_val_if_fail (window != NULL, -1);
g_return_val_if_fail (window != NULL, FALSE);
/* This is a sort of a hack, as there isn't any XDeviceAnyEvent -
but it's potentially faster than scanning through the types of
@ -199,7 +199,7 @@ _gdk_input_other_event (GdkEvent *event,
gdkdev = _gdk_input_find_device (GDK_WINDOW_DISPLAY (window),
((XDeviceButtonEvent *)xevent)->deviceid);
if (!gdkdev)
return -1; /* we don't handle it - not an XInput event */
return FALSE; /* we don't handle it - not an XInput event */
/* FIXME: It would be nice if we could just get rid of the events
entirely, instead of having to ignore them */
@ -214,7 +214,7 @@ _gdk_input_other_event (GdkEvent *event,
return_val = _gdk_input_common_other_event (event, xevent,
input_window, gdkdev);
if (return_val > 0 && event->type == GDK_PROXIMITY_OUT &&
if (return_val && event->type == GDK_PROXIMITY_OUT &&
display_impl->input_ignore_core)
gdk_input_check_proximity(GDK_WINDOW_DISPLAY (window));
@ -357,9 +357,3 @@ _gdk_input_ungrab_pointer (GdkDisplay *display,
}
}
gint
_gdk_input_window_none_event (GdkEvent *event,
XEvent *xevent)
{
return -1;
}