callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use gunichar instead of gint when appropriate in the interfaces

Browse Source 
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
This commit is contained in:
Havoc Pennington
2000-06-21 18:51:36 +00:00
committed by Havoc Pennington
parent 39440b43cd
commit ee0895169d
16 changed files with 142 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtktextsegment.c
View File

@ -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);