diff options
| author | Mike Kestner <mkestner@src.gnome.org> | 2002-11-01 05:30:57 +0800 |
|---|---|---|
| committer | Mike Kestner <mkestner@src.gnome.org> | 2002-11-01 05:30:57 +0800 |
| commit | 613453b1095e325149b8d37e5731d415e1d5f9bd (patch) | |
| tree | 1c0d7f9be4d4a87aa67d8e185ae2bb23d02254b7 /widgets/misc/e-canvas.h | |
| parent | ec242d6c30d7bf056c8f59710b8576c942f93583 (diff) | |
| download | gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.gz gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.zst gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.zip | |
merging the gal-2 branch back to the trunk.
merging the gal-2 branch back to the trunk.
svn path=/trunk/; revision=18471
Diffstat (limited to 'widgets/misc/e-canvas.h')
| -rw-r--r-- | widgets/misc/e-canvas.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/widgets/misc/e-canvas.h b/widgets/misc/e-canvas.h index fb0d7398e7..2cda185ef3 100644 --- a/widgets/misc/e-canvas.h +++ b/widgets/misc/e-canvas.h @@ -24,7 +24,7 @@ #ifndef __E_CANVAS_H__ #define __E_CANVAS_H__ -#include <libgnomeui/gnome-canvas.h> +#include <libgnomecanvas/gnome-canvas.h> #ifdef __cplusplus extern "C" { @@ -88,10 +88,11 @@ struct _ECanvas int visibility_notify_id; GtkWidget *toplevel; guint visibility_first : 1; - +#ifdef GAL_GDK_IM /* Input context for dead key support */ GdkIC *ic; GdkICAttr *ic_attr; +#endif ECanvasItemGrabCancelled grab_cancelled_cb; guint grab_cancelled_check_id; |