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/text/e-text.h | |
| parent | ec242d6c30d7bf056c8f59710b8576c942f93583 (diff) | |
| download | gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.gz gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.bz2 gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.lz gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.xz 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/text/e-text.h')
| -rw-r--r-- | widgets/text/e-text.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/widgets/text/e-text.h b/widgets/text/e-text.h index 49cc4b9e57..911edcd046 100644 --- a/widgets/text/e-text.h +++ b/widgets/text/e-text.h @@ -38,15 +38,13 @@ #define E_TEXT_H #include <gtk/gtkobject.h> -#include <gtk/gtkpacker.h> #include <gal/widgets/e-font.h> #include <gal/util/e-text-event-processor.h> #include <gal/e-text/e-text-model.h> #include <gal/widgets/e-canvas.h> -#include <libgnome/gnome-defs.h> -BEGIN_GNOME_DECLS +G_BEGIN_DECLS /* Text item for the canvas. Text items are positioned by an anchor point and an anchor direction. @@ -249,7 +247,7 @@ struct _EText { gint last_type_request; /* Last selection type requested. */ guint32 last_time_request; /* The time of the last selection request. */ - guint32 last_selection_request; /* The time of the last selection request. */ + GdkAtom last_selection_request; /* The time of the last selection request. */ GList *queued_requests; /* Queued selection requests. */ }; @@ -269,6 +267,6 @@ GtkType e_text_get_type (void); void e_text_cancel_editing (EText *text); void e_text_stop_editing (EText *text); -END_GNOME_DECLS +G_END_DECLS #endif |