From 905f7de48f5c591caa340f099fff821e07bf82e4 Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Thu, 27 Jan 2000 07:51:37 +0000 Subject: Use e_canvas_item_grab_focus so that it will work with old versions of 2000-01-28 Christopher James Lahey * widgets/e-minicard-label.c, widgets/e-minicard.c: Use e_canvas_item_grab_focus so that it will work with old versions of gnome-canvas. * widgets/e-canvas.c, widgets/e-canvas.h: Finished working around focus bugs. svn path=/trunk/; revision=1649 --- addressbook/gui/minicard/e-minicard-label.c | 3 ++- addressbook/gui/minicard/e-minicard.c | 5 +++-- addressbook/gui/widgets/e-minicard-label.c | 3 ++- addressbook/gui/widgets/e-minicard.c | 5 +++-- 4 files changed, 10 insertions(+), 6 deletions(-) (limited to 'addressbook') diff --git a/addressbook/gui/minicard/e-minicard-label.c b/addressbook/gui/minicard/e-minicard-label.c index 2b0fb3faf8..43603f2d6d 100644 --- a/addressbook/gui/minicard/e-minicard-label.c +++ b/addressbook/gui/minicard/e-minicard-label.c @@ -23,6 +23,7 @@ #include #include "e-minicard-label.h" #include "e-text.h" +#include "e-canvas.h" static void e_minicard_label_init (EMinicardLabel *card); static void e_minicard_label_class_init (EMinicardLabelClass *klass); static void e_minicard_label_set_arg (GtkObject *o, GtkArg *arg, guint arg_id); @@ -152,7 +153,7 @@ e_minicard_label_set_arg (GtkObject *o, GtkArg *arg, guint arg_id) break; case ARG_HAS_FOCUS: if (e_minicard_label->field && GTK_VALUE_BOOL(*arg)) - gnome_canvas_item_grab_focus(e_minicard_label->field); + e_canvas_item_grab_focus(e_minicard_label->field); break; case ARG_FIELD: if ( e_minicard_label->field ) diff --git a/addressbook/gui/minicard/e-minicard.c b/addressbook/gui/minicard/e-minicard.c index b6de4b2d0c..b667f1ac21 100644 --- a/addressbook/gui/minicard/e-minicard.c +++ b/addressbook/gui/minicard/e-minicard.c @@ -24,6 +24,7 @@ #include "e-minicard.h" #include "e-minicard-label.h" #include "e-text.h" +#include "e-canvas.h" static void e_minicard_init (EMinicard *card); static void e_minicard_class_init (EMinicardClass *klass); static void e_minicard_set_arg (GtkObject *o, GtkArg *arg, guint arg_id); @@ -153,7 +154,7 @@ e_minicard_set_arg (GtkObject *o, GtkArg *arg, guint arg_id) "has_focus", GTK_VALUE_BOOL(*arg), NULL); else - gnome_canvas_item_grab_focus(GNOME_CANVAS_ITEM(e_minicard)); + e_canvas_item_grab_focus(GNOME_CANVAS_ITEM(e_minicard)); break; case ARG_CARD: /* e_minicard->card = GTK_VALUE_POINTER (*arg); @@ -353,7 +354,7 @@ e_minicard_event (GnomeCanvasItem *item, GdkEvent *event) break; case GDK_BUTTON_PRESS: if (event->button.button == 1) { - gnome_canvas_item_grab_focus(item); + e_canvas_item_grab_focus(item); } break; case GDK_KEY_PRESS: diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c index 2b0fb3faf8..43603f2d6d 100644 --- a/addressbook/gui/widgets/e-minicard-label.c +++ b/addressbook/gui/widgets/e-minicard-label.c @@ -23,6 +23,7 @@ #include #include "e-minicard-label.h" #include "e-text.h" +#include "e-canvas.h" static void e_minicard_label_init (EMinicardLabel *card); static void e_minicard_label_class_init (EMinicardLabelClass *klass); static void e_minicard_label_set_arg (GtkObject *o, GtkArg *arg, guint arg_id); @@ -152,7 +153,7 @@ e_minicard_label_set_arg (GtkObject *o, GtkArg *arg, guint arg_id) break; case ARG_HAS_FOCUS: if (e_minicard_label->field && GTK_VALUE_BOOL(*arg)) - gnome_canvas_item_grab_focus(e_minicard_label->field); + e_canvas_item_grab_focus(e_minicard_label->field); break; case ARG_FIELD: if ( e_minicard_label->field ) diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index b6de4b2d0c..b667f1ac21 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -24,6 +24,7 @@ #include "e-minicard.h" #include "e-minicard-label.h" #include "e-text.h" +#include "e-canvas.h" static void e_minicard_init (EMinicard *card); static void e_minicard_class_init (EMinicardClass *klass); static void e_minicard_set_arg (GtkObject *o, GtkArg *arg, guint arg_id); @@ -153,7 +154,7 @@ e_minicard_set_arg (GtkObject *o, GtkArg *arg, guint arg_id) "has_focus", GTK_VALUE_BOOL(*arg), NULL); else - gnome_canvas_item_grab_focus(GNOME_CANVAS_ITEM(e_minicard)); + e_canvas_item_grab_focus(GNOME_CANVAS_ITEM(e_minicard)); break; case ARG_CARD: /* e_minicard->card = GTK_VALUE_POINTER (*arg); @@ -353,7 +354,7 @@ e_minicard_event (GnomeCanvasItem *item, GdkEvent *event) break; case GDK_BUTTON_PRESS: if (event->button.button == 1) { - gnome_canvas_item_grab_focus(item); + e_canvas_item_grab_focus(item); } break; case GDK_KEY_PRESS: -- cgit v1.2.3