diff options
| author | Havoc Pennington <hp@pobox.com> | 2000-10-02 14:29:24 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2000-10-02 14:29:24 +0000 |
| commit | 8ebf77d13be575f37bb5ef34b79bf1d68a7ead77 (patch) | |
| tree | 5a47b4ede579fb38f2179c621ff308a7248abdf1 /gtk/gtktextsegment.h | |
| parent | 632fda6f0bd578006226b29badcfb63729f5eba2 (diff) | |
| download | gtk+-8ebf77d13be575f37bb5ef34b79bf1d68a7ead77.tar.gz | |
text_window_* weren't static and should have been. Start work on child
2000-10-02 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c: text_window_* weren't static and should have
been.
Start work on child widgets; not yet complete,
syncing to
office computer.
* gtk/gtktextchild.h: change this to contain a public interface,
starting work on child interfaces.
* gtk/gtktextchildprivate.h: move private interfaces here
* gtk/Makefile.am: update to reflect gtktextchildprivate.h
* gtk/gtktextview.h, gtk/gtktextview.c, gtk/gtktextbuffer.h,
gtk/gtktextbuffer.c, gtk/gtktextiter.h, gtk/gtk/textiter.c,
gtk/gtktextmark.c: copyright notices
* gtk/gtktextmarkprivate.h: reformat, and put _ in
front of
internal functions
* gtk/gtktextchild.c (_pixbuf_segment_new): put _ in front of
internal function
* gtk/gtktextlayout.c (gtk_text_layout_get_line_display):
Reformatting
Diffstat (limited to 'gtk/gtktextsegment.h')
| -rw-r--r-- | gtk/gtktextsegment.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/gtk/gtktextsegment.h b/gtk/gtktextsegment.h index 0dfd05630d..a4b88d739e 100644 --- a/gtk/gtktextsegment.h +++ b/gtk/gtktextsegment.h @@ -5,6 +5,7 @@ #include <gtk/gtktextiter.h> #include <gtk/gtktextmarkprivate.h> #include <gtk/gtktextchild.h> +#include <gtk/gtktextchildprivate.h> #ifdef __cplusplus extern "C" { @@ -122,21 +123,22 @@ struct _GtkTextLineSegment { GtkTextToggleBody toggle; /* Information about tag toggle. */ GtkTextMarkBody mark; /* Information about mark. */ GtkTextPixbuf pixbuf; /* Child pixbuf */ -#if 0 - GtkTextChild child; /* child widget */ -#endif + GtkTextChildBody child; /* Child widget */ } body; }; -GtkTextLineSegment *gtk_text_line_segment_split(const GtkTextIter *iter); - -GtkTextLineSegment *char_segment_new(const gchar *text, guint len); +GtkTextLineSegment *gtk_text_line_segment_split (const GtkTextIter *iter); -GtkTextLineSegment *char_segment_new_from_two_strings(const gchar *text1, guint len1, - const gchar *text2, guint len2); +GtkTextLineSegment *char_segment_new (const gchar *text, + guint len); +GtkTextLineSegment *char_segment_new_from_two_strings (const gchar *text1, + guint len1, + const gchar *text2, + guint len2); +GtkTextLineSegment *toggle_segment_new (GtkTextTagInfo *info, + gboolean on); -GtkTextLineSegment *toggle_segment_new(GtkTextTagInfo *info, gboolean on); #ifdef __cplusplus } |