aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher James Lahey <clahey@helixcode.com>2000-07-12 09:16:42 +0800
committerChris Lahey <clahey@src.gnome.org>2000-07-12 09:16:42 +0800
commit4cd310350fc1bf8206c5ba0bbf59b1e22385876d (patch)
tree2e5199cc4fa51ef949bc9e6cfc989be75c7c6671
parent71cd8403b210d4eda9ba80f4a47a43b5def7f769 (diff)
downloadgsoc2013-evolution-4cd310350fc1bf8206c5ba0bbf59b1e22385876d.tar
gsoc2013-evolution-4cd310350fc1bf8206c5ba0bbf59b1e22385876d.tar.gz
gsoc2013-evolution-4cd310350fc1bf8206c5ba0bbf59b1e22385876d.tar.bz2
gsoc2013-evolution-4cd310350fc1bf8206c5ba0bbf59b1e22385876d.tar.lz
gsoc2013-evolution-4cd310350fc1bf8206c5ba0bbf59b1e22385876d.tar.xz
gsoc2013-evolution-4cd310350fc1bf8206c5ba0bbf59b1e22385876d.tar.zst
gsoc2013-evolution-4cd310350fc1bf8206c5ba0bbf59b1e22385876d.zip
Removed some debugging printfs.
2000-07-11 Christopher James Lahey <clahey@helixcode.com> * e-canvas-vbox.c: Removed some debugging printfs. * e-canvas.c (e_canvas_unrealize): Call parent unrealize method. svn path=/trunk/; revision=4102
-rw-r--r--e-util/ChangeLog6
-rw-r--r--e-util/e-canvas-vbox.c2
-rw-r--r--e-util/e-canvas.c7
-rw-r--r--widgets/misc/e-canvas-vbox.c2
-rw-r--r--widgets/misc/e-canvas.c7
5 files changed, 18 insertions, 6 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index df65a59deb..ba3b0abb95 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,9 @@
+2000-07-11 Christopher James Lahey <clahey@helixcode.com>
+
+ * e-canvas-vbox.c: Removed some debugging printfs.
+
+ * e-canvas.c (e_canvas_unrealize): Call parent unrealize method.
+
2000-07-10 Ettore Perazzoli <ettore@helixcode.com>
* e-sexp.c (eval_dump_result): `#if 0'ed out.
diff --git a/e-util/e-canvas-vbox.c b/e-util/e-canvas-vbox.c
index f42fca4a30..2d389a83e6 100644
--- a/e-util/e-canvas-vbox.c
+++ b/e-util/e-canvas-vbox.c
@@ -299,8 +299,6 @@ e_canvas_vbox_reflow( GnomeCanvasItem *item, int flags )
"height", &item_height,
NULL);
- g_print ("%f\n", running_height);
-
e_canvas_item_move_absolute(GNOME_CANVAS_ITEM(list->data),
(double) 0,
(double) running_height);
diff --git a/e-util/e-canvas.c b/e-util/e-canvas.c
index 4cb912283e..beb90a2e40 100644
--- a/e-util/e-canvas.c
+++ b/e-util/e-canvas.c
@@ -348,12 +348,15 @@ static gint
e_canvas_focus_out (GtkWidget *widget, GdkEventFocus *event)
{
GnomeCanvas *canvas;
+ ECanvas *ecanvas;
canvas = GNOME_CANVAS (widget);
+ ecanvas = E_CANVAS (widget);
GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS);
- gdk_im_end ();
+ if (ecanvas->ic)
+ gdk_im_end ();
if (canvas->focused_item)
return emit_event (canvas, (GdkEvent *) event);
@@ -410,6 +413,8 @@ e_canvas_unrealize (GtkWidget *widget)
gdk_ic_attr_destroy (ecanvas->ic_attr);
ecanvas->ic_attr = NULL;
}
+ if (GTK_WIDGET_CLASS (parent_class)->unrealize)
+ (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
}
static void
diff --git a/widgets/misc/e-canvas-vbox.c b/widgets/misc/e-canvas-vbox.c
index f42fca4a30..2d389a83e6 100644
--- a/widgets/misc/e-canvas-vbox.c
+++ b/widgets/misc/e-canvas-vbox.c
@@ -299,8 +299,6 @@ e_canvas_vbox_reflow( GnomeCanvasItem *item, int flags )
"height", &item_height,
NULL);
- g_print ("%f\n", running_height);
-
e_canvas_item_move_absolute(GNOME_CANVAS_ITEM(list->data),
(double) 0,
(double) running_height);
diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c
index 4cb912283e..beb90a2e40 100644
--- a/widgets/misc/e-canvas.c
+++ b/widgets/misc/e-canvas.c
@@ -348,12 +348,15 @@ static gint
e_canvas_focus_out (GtkWidget *widget, GdkEventFocus *event)
{
GnomeCanvas *canvas;
+ ECanvas *ecanvas;
canvas = GNOME_CANVAS (widget);
+ ecanvas = E_CANVAS (widget);
GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS);
- gdk_im_end ();
+ if (ecanvas->ic)
+ gdk_im_end ();
if (canvas->focused_item)
return emit_event (canvas, (GdkEvent *) event);
@@ -410,6 +413,8 @@ e_canvas_unrealize (GtkWidget *widget)
gdk_ic_attr_destroy (ecanvas->ic_attr);
ecanvas->ic_attr = NULL;
}
+ if (GTK_WIDGET_CLASS (parent_class)->unrealize)
+ (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
}
static void