diff options
Diffstat (limited to 'widgets/misc')
| -rw-r--r-- | widgets/misc/e-canvas-utils.h | 7 | ||||
| -rw-r--r-- | widgets/misc/e-reflow.c | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/widgets/misc/e-canvas-utils.h b/widgets/misc/e-canvas-utils.h index 13ec43117c..9580f64f96 100644 --- a/widgets/misc/e-canvas-utils.h +++ b/widgets/misc/e-canvas-utils.h @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * e-canvas-utils.c + * e-canvas-utils.h * Copyright (C) 2000 Helix Code, Inc. * Author: Chris Lahey <clahey@helixcode.com> * @@ -20,5 +20,10 @@ * Boston, MA 02111-1307, USA. */ +#ifndef __E_CANVAS_UTILS__ +#define __E_CANVAS_UTILS__ + #include <gnome.h> void e_canvas_item_move_absolute (GnomeCanvasItem *item, double dx, double dy); + +#endif /* __E_CANVAS_UTILS__ */ diff --git a/widgets/misc/e-reflow.c b/widgets/misc/e-reflow.c index c1022f8f78..984e972f0c 100644 --- a/widgets/misc/e-reflow.c +++ b/widgets/misc/e-reflow.c @@ -24,6 +24,7 @@ #include <math.h> #include "e-reflow.h" #include "e-canvas-utils.h" +#include "e-util.h" static void e_reflow_init (EReflow *card); static void e_reflow_class_init (EReflowClass *klass); static void e_reflow_set_arg (GtkObject *o, GtkArg *arg, guint arg_id); @@ -278,7 +279,7 @@ e_reflow_event (GnomeCanvasItem *item, GdkEvent *event) GList *list; for (list = e_reflow->items; list; list = list->next) { GnomeCanvasItem *item = GNOME_CANVAS_ITEM (list->data); - gboolean has_focus; + EFocus has_focus; gtk_object_get(GTK_OBJECT(item), "has_focus", &has_focus, NULL); @@ -290,7 +291,7 @@ e_reflow_event (GnomeCanvasItem *item, GdkEvent *event) if (list) { item = GNOME_CANVAS_ITEM(list->data); gnome_canvas_item_set(item, - "has_focus", TRUE, + "has_focus", (event->key.state & GDK_SHIFT_MASK) ? E_FOCUS_END : E_FOCUS_START, NULL); return 1; } else { @@ -625,7 +626,6 @@ e_reflow_point (GnomeCanvasItem *item, double x, double y, int cx, int cy, GnomeCanvasItem **actual_item) { - EReflow *e_reflow = E_REFLOW(item); double distance = 1; if (GNOME_CANVAS_ITEM_CLASS(parent_class)->point) |