diff options
| author | Havoc Pennington <hp@pobox.com> | 2000-12-16 07:01:48 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2000-12-16 07:01:48 +0000 |
| commit | e405f75c2b904698f71280348687254b91d8ff47 (patch) | |
| tree | 3e94d6db1f35d1c9f60ce26ba6395b43851e661e /gtk/gtktextlayout.h | |
| parent | 9d41afc90a3f261db2cab33e240b34232c2b117f (diff) | |
| download | gtk+-e405f75c2b904698f71280348687254b91d8ff47.tar.gz | |
General cleanup of the log attr iteration stuff. This should make e.g. the
2000-12-16 Havoc Pennington <hp@pobox.com>
* gtk/gtktextiter.c: General cleanup of the log attr iteration
stuff. This should make e.g. the delete key work again in the
text widget...
(gtk_text_iter_forward_cursor_positions): handle negative count
(gtk_text_iter_backward_cursor_positions): handle negative count
(gtk_text_iter_forward_word_ends): handle negative count
(gtk_text_iter_backward_word_starts): handle negative count
* gtk/gtktextlayout.h, gtk/gtktextlayout.c, gtk/gtktexttag.h,
gtk/gtktexttag.c, gtk/gtktexttagtable.h, gtk/gtktexttagtable.c,
gtk/gtktextbuffer.h, gtk/gtktextbuffer.c: Convert everything to
GObject. No doubt will cause breakage.
* demos/gtk-demo/textview.c: remove hacks around
non-GObject-ification of the text objects
* demos/gtk-demo/main.c (main): use g_object_set() to manipulate
the text tag
Diffstat (limited to 'gtk/gtktextlayout.h')
| -rw-r--r-- | gtk/gtktextlayout.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gtk/gtktextlayout.h b/gtk/gtktextlayout.h index 8977a97eb7..e6cde73f85 100644 --- a/gtk/gtktextlayout.h +++ b/gtk/gtktextlayout.h @@ -100,11 +100,11 @@ typedef struct _GtkTextLine GtkTextLine; typedef struct _GtkTextLineData GtkTextLineData; #define GTK_TYPE_TEXT_LAYOUT (gtk_text_layout_get_type ()) -#define GTK_TEXT_LAYOUT(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_TEXT_LAYOUT, GtkTextLayout)) -#define GTK_TEXT_LAYOUT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT_LAYOUT, GtkTextLayoutClass)) -#define GTK_IS_TEXT_LAYOUT(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_TEXT_LAYOUT)) -#define GTK_IS_TEXT_LAYOUT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TEXT_LAYOUT)) -#define GTK_TEXT_LAYOUT_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TEXT_LAYOUT, GtkTextLayoutClass)) +#define GTK_TEXT_LAYOUT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TEXT_LAYOUT, GtkTextLayout)) +#define GTK_TEXT_LAYOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT_LAYOUT, GtkTextLayoutClass)) +#define GTK_IS_TEXT_LAYOUT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TEXT_LAYOUT)) +#define GTK_IS_TEXT_LAYOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TEXT_LAYOUT)) +#define GTK_TEXT_LAYOUT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TEXT_LAYOUT, GtkTextLayoutClass)) typedef struct _GtkTextLayout GtkTextLayout; typedef struct _GtkTextLayoutClass GtkTextLayoutClass; @@ -114,7 +114,7 @@ typedef struct _GtkTextAttrAppearance GtkTextAttrAppearance; struct _GtkTextLayout { - GtkObject parent_instance; + GObject parent_instance; /* width of the display area on-screen, * i.e. pixels we should wrap to fit inside. */ @@ -167,7 +167,7 @@ struct _GtkTextLayout struct _GtkTextLayoutClass { - GtkObjectClass parent_class; + GObjectClass parent_class; /* Some portion of the layout was invalidated */ @@ -239,7 +239,7 @@ struct _GtkTextLineDisplay extern PangoAttrType gtk_text_attr_appearance_type; -GtkType gtk_text_layout_get_type (void) G_GNUC_CONST; +GType gtk_text_layout_get_type (void) G_GNUC_CONST; GtkTextLayout* gtk_text_layout_new (void); void gtk_text_layout_set_buffer (GtkTextLayout *layout, GtkTextBuffer *buffer); |