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

Since gdkevent is a union, casting a smaller struct to a gdkevent caused

Browse Source 
2001-02-09  JP Rosevear  <jpr@ximian.com>

	* gal/widgets/e-canvas.c (e_canvas_key): Since gdkevent is a
	union, casting a smaller struct to a gdkevent caused unknown
	memory to be copied around.  fix by copying to a full gdkevent
	structure before calling gdkevent.
	(e_canvas_focus_in): ditto
	(e_canvas_focus_out): ditto

svn path=/trunk/; revision=8153
This commit is contained in:
JP Rosevear
2001-02-09 22:27:37 +00:00
committed by JP Rosevear
parent 919644966e
commit 414408be59
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
widgets/misc/e-canvas.c
View File

@ -271,14 +271,17 @@ static gint
e_canvas_key (GtkWidget *widget, GdkEventKey *event)
{
GnomeCanvas *canvas;
GdkEvent full_event;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GNOME_IS_CANVAS (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
canvas = GNOME_CANVAS (widget);
full_event.key = *event;
return emit_event (canvas, (GdkEvent *) event);
return emit_event (canvas, &full_event);
}
@ -333,6 +336,7 @@ e_canvas_focus_in (GtkWidget *widget, GdkEventFocus *event)
{
GnomeCanvas *canvas;
ECanvas *ecanvas;
GdkEvent full_event;
canvas = GNOME_CANVAS (widget);
ecanvas = E_CANVAS (widget);
@ -342,10 +346,12 @@ e_canvas_focus_in (GtkWidget *widget, GdkEventFocus *event)
if (ecanvas->ic)
gdk_im_begin (ecanvas->ic, canvas->layout.bin_window);
if (canvas->focused_item)
return emit_event (canvas, (GdkEvent *) event);
else
if (canvas->focused_item) {
full_event.focus_change = *event;
return emit_event (canvas, &full_event);
} else {
return FALSE;
}
}
/* Focus out handler for the canvas */
@ -354,6 +360,7 @@ e_canvas_focus_out (GtkWidget *widget, GdkEventFocus *event)
{
GnomeCanvas *canvas;
ECanvas *ecanvas;
GdkEvent full_event;
canvas = GNOME_CANVAS (widget);
ecanvas = E_CANVAS (widget);
@ -363,10 +370,12 @@ e_canvas_focus_out (GtkWidget *widget, GdkEventFocus *event)
if (ecanvas->ic)
gdk_im_end ();
if (canvas->focused_item)
return emit_event (canvas, (GdkEvent *) event);
else
if (canvas->focused_item) {
full_event.focus_change = *event;
return emit_event (canvas, &full_event);
} else {
return FALSE;
}
}
static void