summaryrefslogtreecommitdiff
path: root/gtk/gtktextsegment.c
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2000-06-21 18:51:36 +0000
committerHavoc Pennington <hp@src.gnome.org>2000-06-21 18:51:36 +0000
commitee0895169d57f2d67f7d1b85f941a6fa31b439f0 (patch)
treeba18a8c1dadf39c999e4d8fd7367eaa9117222eb /gtk/gtktextsegment.c
parent39440b43cd618dffea5d25d63ac2f05a433e293e (diff)
downloadgtk+-ee0895169d57f2d67f7d1b85f941a6fa31b439f0.tar.gz
Use gunichar instead of gint when appropriate in the interfaces
2000-06-21 Havoc Pennington <hp@redhat.com> * gtk/gtktextiter.h: Use gunichar instead of gint when appropriate in the interfaces * gtk/gtktexttypes.c: Remove UTF functions, use glib stuff instead when possible. * gtk/gtktexttypes.h: Delete some unused constants * gtktextbtree.c, gtktextiter.c, gtktextsegment.c, gtktextview.c, testtextbuffer.c: use glib instead of custom unicode routines
Diffstat (limited to 'gtk/gtktextsegment.c')
-rw-r--r--gtk/gtktextsegment.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk/gtktextsegment.c b/gtk/gtktextsegment.c
index e4effa1b5c..38e905865b 100644
--- a/gtk/gtktextsegment.c
+++ b/gtk/gtktextsegment.c
@@ -177,7 +177,7 @@ char_segment_self_check(GtkTextLineSegment *seg)
g_error("char_segment_check_func: segment has wrong size");
}
- if (gtk_text_view_num_utf_chars(seg->body.chars, seg->byte_count) != seg->char_count)
+ if (g_utf8_strlen (seg->body.chars, seg->byte_count) != seg->char_count)
{
g_error("char segment has wrong character count");
}
@@ -197,7 +197,7 @@ char_segment_new(const gchar *text, guint len)
memcpy(seg->body.chars, text, len);
seg->body.chars[len] = '\0';
- seg->char_count = gtk_text_view_num_utf_chars(seg->body.chars, seg->byte_count);
+ seg->char_count = g_utf8_strlen (seg->body.chars, seg->byte_count);
if (gtk_debug_flags & GTK_DEBUG_TEXT)
char_segment_self_check(seg);
@@ -224,7 +224,7 @@ char_segment_new_from_two_strings(const gchar *text1, guint len1,
/* In principle this function could probably take chars1 and chars2
as args, since it's typically used to merge two char segments */
- seg->char_count = gtk_text_view_num_utf_chars(seg->body.chars, seg->byte_count);
+ seg->char_count = g_utf8_strlen (seg->body.chars, seg->byte_count);
if (gtk_debug_flags & GTK_DEBUG_TEXT)
char_segment_self_check(seg);