Switch from gnome_canvas_item_grab to e_canvas_item_grab.

2002-05-09  Christopher James Lahey  <clahey@ximian.com>

	* gal/e-text/e-text.c: Switch from gnome_canvas_item_grab to
	e_canvas_item_grab.

	* gal/widgets/e-canvas.c, gal/widgets/e-canvas.h
	(e_canvas_item_grab, e_canvas_item_ungrab): Added these functions.

From gal/e-table/ChangeLog:

2002-05-09  Christopher James Lahey  <clahey@ximian.com>

	* e-table-item.c, e-table-item.h: Switched from
	gnome_canvas_item_grab to e_canvas_item_grab.

svn path=/trunk/; revision=16738

1 files changed, 43 insertions, 18 deletions

diff --git a/widgets/misc/e-canvas.h b/widgets/misc/e-canvas.h
index ee25a4b6bf..fb0d7398e7 100644
--- a/widgets/misc/e-canvas.h
+++ b/widgets/misc/e-canvas.h
@@ -74,6 +74,8 @@ typedef struct {
 	gpointer         id;
 } ECanvasSelectionInfo;
 
+typedef void (*ECanvasItemGrabCancelled) (ECanvas *canvas, GnomeCanvasItem *item, gpointer data);
+
 struct _ECanvas
 {
 	GnomeCanvas parent;
@@ -90,6 +92,11 @@ struct _ECanvas
 	/* Input context for dead key support */
 	GdkIC     *ic;
 	GdkICAttr *ic_attr;
+
+	ECanvasItemGrabCancelled grab_cancelled_cb;
+	guint grab_cancelled_check_id;
+	guint32 grab_cancelled_time;
+	gpointer grab_cancelled_data;
 };
 
 struct _ECanvasClass
@@ -99,30 +106,48 @@ struct _ECanvasClass
 };
 
 
-GtkType    e_canvas_get_type (void);
-GtkWidget *e_canvas_new      (void);
+GtkType    e_canvas_get_type                             (void);
+GtkWidget *e_canvas_new                                  (void);
 
 /* Used to send all of the keystroke events to a specific item as well as
  * GDK_FOCUS_CHANGE events.
  */
-void e_canvas_item_grab_focus (GnomeCanvasItem *item, gboolean widget_too);
-
-void e_canvas_item_request_reflow (GnomeCanvasItem *item);
-void e_canvas_item_request_parent_reflow (GnomeCanvasItem *item);
-void e_canvas_item_set_reflow_callback (GnomeCanvasItem *item, ECanvasItemReflowFunc func);
-
-void e_canvas_item_set_selection_callback (GnomeCanvasItem *item, ECanvasItemSelectionFunc func);
-void e_canvas_item_set_selection_compare_callback (GnomeCanvasItem *item, ECanvasItemSelectionCompareFunc func);
-
-void e_canvas_item_set_cursor (GnomeCanvasItem *item, gpointer id);
-void e_canvas_item_add_selection (GnomeCanvasItem *item, gpointer id);
-void e_canvas_item_remove_selection (GnomeCanvasItem *item, gpointer id);
+void       e_canvas_item_grab_focus                      (GnomeCanvasItem                 *item,
+							  gboolean                         widget_too);
+void       e_canvas_item_request_reflow                  (GnomeCanvasItem                 *item);
+void       e_canvas_item_request_parent_reflow           (GnomeCanvasItem                 *item);
+void       e_canvas_item_set_reflow_callback             (GnomeCanvasItem                 *item,
+							  ECanvasItemReflowFunc            func);
+void       e_canvas_item_set_selection_callback          (GnomeCanvasItem                 *item,
+							  ECanvasItemSelectionFunc         func);
+void       e_canvas_item_set_selection_compare_callback  (GnomeCanvasItem                 *item,
+							  ECanvasItemSelectionCompareFunc  func);
+void       e_canvas_item_set_cursor                      (GnomeCanvasItem                 *item,
+							  gpointer                         id);
+void       e_canvas_item_add_selection                   (GnomeCanvasItem                 *item,
+							  gpointer                         id);
+void       e_canvas_item_remove_selection                (GnomeCanvasItem                 *item,
+							  gpointer                         id);
+
+int        e_canvas_item_grab                            (ECanvas                         *canvas,
+							  GnomeCanvasItem                 *item,
+							  guint                            event_mask,
+							  GdkCursor                       *cursor,
+							  guint32                          etime,
+							  ECanvasItemGrabCancelled         cancelled,
+							  gpointer                         cancelled_data);
+void       e_canvas_item_ungrab                          (ECanvas                         *canvas,
+							  GnomeCanvasItem                 *item,
+							  guint32                          etime);
 
 /* Not implemented yet. */
-void e_canvas_item_set_cursor_end (GnomeCanvasItem *item, gpointer id);
-
-void e_canvas_popup_tooltip (ECanvas *canvas, GtkWidget *widget, int x, int y);
-void e_canvas_hide_tooltip  (ECanvas *canvas);
+void       e_canvas_item_set_cursor_end                  (GnomeCanvasItem                 *item,
+							  gpointer                         id);
+void       e_canvas_popup_tooltip                        (ECanvas                         *canvas,
+							  GtkWidget                       *widget,
+							  int                              x,
+							  int                              y);
+void       e_canvas_hide_tooltip                         (ECanvas                         *canvas);
 
 #ifdef __cplusplus
 }