forked from AuroraMiddleware/gtk
fix constness warning
2000-10-26 Havoc Pennington <hp@redhat.com>
* gtk/gtktextiter.c (my_strrstr): fix constness warning
Fixed output of:
nm -g -l .libs/libgtk-x11-1.3.so | grep ' T ' | grep -v gtk_ | grep -v GTK_
* gtk/gtktextsegment.c (char_segment_new): rename
(_char_segment_new_from_two_strings): rename
(_toggle_segment_new): rename
* gtk/gtkclipboard.c (ensure_clipboard_widget): make this static
(make_clipboard_widget): make it static
(text_get_func): static
(text_clear_func): static
* gtk/gtkcolorsel.c (adjustment_changed): make this function
static
(hex_changed): make it static
(hsv_changed): make it static
(opacity_entry_changed): make it static
* gtk/gtktextbtree.c (change_node_toggle_count): rename with _gtk
(toggle_segment_check_func): rename with _gtk
* gtk/gtktextchild.c (_pixbuf_segment_new): rename with _gtk
(_widget_segment_new): rename
(_widget_segment_add): rename
(_widget_segment_remove): rename
(_widget_segment_ref): rename
(_widget_segment_unref): rename
* gtk/gtktextmark.c (_mark_segment_new): Rename
_gtk_mark_segment_new
This commit is contained in:
Havoc Pennington
Havoc Pennington
parent
a291b0be4c
commit
3605930213
35
ChangeLog
35
ChangeLog
@ -1,3 +1,38 @@
|
||||
2000-10-26 Havoc Pennington <hp@redhat.com>
|
||||
|
||||
* gtk/gtktextiter.c (my_strrstr): fix constness warning
|
||||
|
||||
Fixed output of:
|
||||
nm -g -l .libs/libgtk-x11-1.3.so | grep ' T ' | grep -v gtk_ | grep -v GTK_
|
||||
|
||||
* gtk/gtktextsegment.c (char_segment_new): rename
|
||||
(_char_segment_new_from_two_strings): rename
|
||||
(_toggle_segment_new): rename
|
||||
|
||||
* gtk/gtkclipboard.c (ensure_clipboard_widget): make this static
|
||||
(make_clipboard_widget): make it static
|
||||
(text_get_func): static
|
||||
(text_clear_func): static
|
||||
|
||||
* gtk/gtkcolorsel.c (adjustment_changed): make this function
|
||||
static
|
||||
(hex_changed): make it static
|
||||
(hsv_changed): make it static
|
||||
(opacity_entry_changed): make it static
|
||||
|
||||
* gtk/gtktextbtree.c (change_node_toggle_count): rename with _gtk
|
||||
(toggle_segment_check_func): rename with _gtk
|
||||
|
||||
* gtk/gtktextchild.c (_pixbuf_segment_new): rename with _gtk
|
||||
(_widget_segment_new): rename
|
||||
(_widget_segment_add): rename
|
||||
(_widget_segment_remove): rename
|
||||
(_widget_segment_ref): rename
|
||||
(_widget_segment_unref): rename
|
||||
|
||||
* gtk/gtktextmark.c (_mark_segment_new): Rename
|
||||
_gtk_mark_segment_new
|
||||
|
||||
2000-10-26 Havoc Pennington <hp@redhat.com>
|
||||
|
||||
* gtk/gtkmarshal.list: add new marshallers used by the text widget
|
||||
|
||||
@ -1,3 +1,38 @@
|
||||
2000-10-26 Havoc Pennington <hp@redhat.com>
|
||||
|
||||
* gtk/gtktextiter.c (my_strrstr): fix constness warning
|
||||
|
||||
Fixed output of:
|
||||
nm -g -l .libs/libgtk-x11-1.3.so | grep ' T ' | grep -v gtk_ | grep -v GTK_
|
||||
|
||||
* gtk/gtktextsegment.c (char_segment_new): rename
|
||||
(_char_segment_new_from_two_strings): rename
|
||||
(_toggle_segment_new): rename
|
||||
|
||||
* gtk/gtkclipboard.c (ensure_clipboard_widget): make this static
|
||||
(make_clipboard_widget): make it static
|
||||
(text_get_func): static
|
||||
(text_clear_func): static
|
||||
|
||||
* gtk/gtkcolorsel.c (adjustment_changed): make this function
|
||||
static
|
||||
(hex_changed): make it static
|
||||
(hsv_changed): make it static
|
||||
(opacity_entry_changed): make it static
|
||||
|
||||
* gtk/gtktextbtree.c (change_node_toggle_count): rename with _gtk
|
||||
(toggle_segment_check_func): rename with _gtk
|
||||
|
||||
* gtk/gtktextchild.c (_pixbuf_segment_new): rename with _gtk
|
||||
(_widget_segment_new): rename
|
||||
(_widget_segment_add): rename
|
||||
(_widget_segment_remove): rename
|
||||
(_widget_segment_ref): rename
|
||||
(_widget_segment_unref): rename
|
||||
|
||||
* gtk/gtktextmark.c (_mark_segment_new): Rename
|
||||
_gtk_mark_segment_new
|
||||
|
||||
2000-10-26 Havoc Pennington <hp@redhat.com>
|
||||
|
||||
* gtk/gtkmarshal.list: add new marshallers used by the text widget
|
||||
|
||||
@ -1,3 +1,38 @@
|
||||
2000-10-26 Havoc Pennington <hp@redhat.com>
|
||||
|
||||
* gtk/gtktextiter.c (my_strrstr): fix constness warning
|
||||
|
||||
Fixed output of:
|
||||
nm -g -l .libs/libgtk-x11-1.3.so | grep ' T ' | grep -v gtk_ | grep -v GTK_
|
||||
|
||||
* gtk/gtktextsegment.c (char_segment_new): rename
|
||||
(_char_segment_new_from_two_strings): rename
|
||||
(_toggle_segment_new): rename
|
||||
|
||||
* gtk/gtkclipboard.c (ensure_clipboard_widget): make this static
|
||||
(make_clipboard_widget): make it static
|
||||
(text_get_func): static
|
||||
(text_clear_func): static
|
||||
|
||||
* gtk/gtkcolorsel.c (adjustment_changed): make this function
|
||||
static
|
||||
(hex_changed): make it static
|
||||
(hsv_changed): make it static
|
||||
(opacity_entry_changed): make it static
|
||||
|
||||
* gtk/gtktextbtree.c (change_node_toggle_count): rename with _gtk
|
||||
(toggle_segment_check_func): rename with _gtk
|
||||
|
||||
* gtk/gtktextchild.c (_pixbuf_segment_new): rename with _gtk
|
||||
(_widget_segment_new): rename
|
||||
(_widget_segment_add): rename
|
||||
(_widget_segment_remove): rename
|
||||
(_widget_segment_ref): rename
|
||||
(_widget_segment_unref): rename
|
||||
|
||||
* gtk/gtktextmark.c (_mark_segment_new): Rename
|
||||
_gtk_mark_segment_new
|
||||
|
||||
2000-10-26 Havoc Pennington <hp@redhat.com>
|
||||
|
||||
* gtk/gtkmarshal.list: add new marshallers used by the text widget
|
||||
|
||||
@ -1,3 +1,38 @@
|
||||
2000-10-26 Havoc Pennington <hp@redhat.com>
|
||||
|
||||
* gtk/gtktextiter.c (my_strrstr): fix constness warning
|
||||
|
||||
Fixed output of:
|
||||
nm -g -l .libs/libgtk-x11-1.3.so | grep ' T ' | grep -v gtk_ | grep -v GTK_
|
||||
|
||||
* gtk/gtktextsegment.c (char_segment_new): rename
|
||||
(_char_segment_new_from_two_strings): rename
|
||||
(_toggle_segment_new): rename
|
||||
|
||||
* gtk/gtkclipboard.c (ensure_clipboard_widget): make this static
|
||||
(make_clipboard_widget): make it static
|
||||
(text_get_func): static
|
||||
(text_clear_func): static
|
||||
|
||||
* gtk/gtkcolorsel.c (adjustment_changed): make this function
|
||||
static
|
||||
(hex_changed): make it static
|
||||
(hsv_changed): make it static
|
||||
(opacity_entry_changed): make it static
|
||||
|
||||
* gtk/gtktextbtree.c (change_node_toggle_count): rename with _gtk
|
||||
(toggle_segment_check_func): rename with _gtk
|
||||
|
||||
* gtk/gtktextchild.c (_pixbuf_segment_new): rename with _gtk
|
||||
(_widget_segment_new): rename
|
||||
(_widget_segment_add): rename
|
||||
(_widget_segment_remove): rename
|
||||
(_widget_segment_ref): rename
|
||||
(_widget_segment_unref): rename
|
||||
|
||||
* gtk/gtktextmark.c (_mark_segment_new): Rename
|
||||
_gtk_mark_segment_new
|
||||
|
||||
2000-10-26 Havoc Pennington <hp@redhat.com>
|
||||
|
||||
* gtk/gtkmarshal.list: add new marshallers used by the text widget
|
||||
|
||||
@ -1,3 +1,38 @@
|
||||
2000-10-26 Havoc Pennington <hp@redhat.com>
|
||||
|
||||
* gtk/gtktextiter.c (my_strrstr): fix constness warning
|
||||
|
||||
Fixed output of:
|
||||
nm -g -l .libs/libgtk-x11-1.3.so | grep ' T ' | grep -v gtk_ | grep -v GTK_
|
||||
|
||||
* gtk/gtktextsegment.c (char_segment_new): rename
|
||||
(_char_segment_new_from_two_strings): rename
|
||||
(_toggle_segment_new): rename
|
||||
|
||||
* gtk/gtkclipboard.c (ensure_clipboard_widget): make this static
|
||||
(make_clipboard_widget): make it static
|
||||
(text_get_func): static
|
||||
(text_clear_func): static
|
||||
|
||||
* gtk/gtkcolorsel.c (adjustment_changed): make this function
|
||||
static
|
||||
(hex_changed): make it static
|
||||
(hsv_changed): make it static
|
||||
(opacity_entry_changed): make it static
|
||||
|
||||
* gtk/gtktextbtree.c (change_node_toggle_count): rename with _gtk
|
||||
(toggle_segment_check_func): rename with _gtk
|
||||
|
||||
* gtk/gtktextchild.c (_pixbuf_segment_new): rename with _gtk
|
||||
(_widget_segment_new): rename
|
||||
(_widget_segment_add): rename
|
||||
(_widget_segment_remove): rename
|
||||
(_widget_segment_ref): rename
|
||||
(_widget_segment_unref): rename
|
||||
|
||||
* gtk/gtktextmark.c (_mark_segment_new): Rename
|
||||
_gtk_mark_segment_new
|
||||
|
||||
2000-10-26 Havoc Pennington <hp@redhat.com>
|
||||
|
||||
* gtk/gtkmarshal.list: add new marshallers used by the text widget
|
||||
|
||||
@ -1,3 +1,38 @@
|
||||
2000-10-26 Havoc Pennington <hp@redhat.com>
|
||||
|
||||
* gtk/gtktextiter.c (my_strrstr): fix constness warning
|
||||
|
||||
Fixed output of:
|
||||
nm -g -l .libs/libgtk-x11-1.3.so | grep ' T ' | grep -v gtk_ | grep -v GTK_
|
||||
|
||||
* gtk/gtktextsegment.c (char_segment_new): rename
|
||||
(_char_segment_new_from_two_strings): rename
|
||||
(_toggle_segment_new): rename
|
||||
|
||||
* gtk/gtkclipboard.c (ensure_clipboard_widget): make this static
|
||||
(make_clipboard_widget): make it static
|
||||
(text_get_func): static
|
||||
(text_clear_func): static
|
||||
|
||||
* gtk/gtkcolorsel.c (adjustment_changed): make this function
|
||||
static
|
||||
(hex_changed): make it static
|
||||
(hsv_changed): make it static
|
||||
(opacity_entry_changed): make it static
|
||||
|
||||
* gtk/gtktextbtree.c (change_node_toggle_count): rename with _gtk
|
||||
(toggle_segment_check_func): rename with _gtk
|
||||
|
||||
* gtk/gtktextchild.c (_pixbuf_segment_new): rename with _gtk
|
||||
(_widget_segment_new): rename
|
||||
(_widget_segment_add): rename
|
||||
(_widget_segment_remove): rename
|
||||
(_widget_segment_ref): rename
|
||||
(_widget_segment_unref): rename
|
||||
|
||||
* gtk/gtktextmark.c (_mark_segment_new): Rename
|
||||
_gtk_mark_segment_new
|
||||
|
||||
2000-10-26 Havoc Pennington <hp@redhat.com>
|
||||
|
||||
* gtk/gtkmarshal.list: add new marshallers used by the text widget
|
||||
|
||||
@ -1,3 +1,38 @@
|
||||
2000-10-26 Havoc Pennington <hp@redhat.com>
|
||||
|
||||
* gtk/gtktextiter.c (my_strrstr): fix constness warning
|
||||
|
||||
Fixed output of:
|
||||
nm -g -l .libs/libgtk-x11-1.3.so | grep ' T ' | grep -v gtk_ | grep -v GTK_
|
||||
|
||||
* gtk/gtktextsegment.c (char_segment_new): rename
|
||||
(_char_segment_new_from_two_strings): rename
|
||||
(_toggle_segment_new): rename
|
||||
|
||||
* gtk/gtkclipboard.c (ensure_clipboard_widget): make this static
|
||||
(make_clipboard_widget): make it static
|
||||
(text_get_func): static
|
||||
(text_clear_func): static
|
||||
|
||||
* gtk/gtkcolorsel.c (adjustment_changed): make this function
|
||||
static
|
||||
(hex_changed): make it static
|
||||
(hsv_changed): make it static
|
||||
(opacity_entry_changed): make it static
|
||||
|
||||
* gtk/gtktextbtree.c (change_node_toggle_count): rename with _gtk
|
||||
(toggle_segment_check_func): rename with _gtk
|
||||
|
||||
* gtk/gtktextchild.c (_pixbuf_segment_new): rename with _gtk
|
||||
(_widget_segment_new): rename
|
||||
(_widget_segment_add): rename
|
||||
(_widget_segment_remove): rename
|
||||
(_widget_segment_ref): rename
|
||||
(_widget_segment_unref): rename
|
||||
|
||||
* gtk/gtktextmark.c (_mark_segment_new): Rename
|
||||
_gtk_mark_segment_new
|
||||
|
||||
2000-10-26 Havoc Pennington <hp@redhat.com>
|
||||
|
||||
* gtk/gtkmarshal.list: add new marshallers used by the text widget
|
||||
|
||||
@ -157,7 +157,7 @@ selection_clear_event_cb (GtkWidget *widget,
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
GtkWidget *
|
||||
static GtkWidget *
|
||||
make_clipboard_widget (gboolean provider)
|
||||
{
|
||||
GtkWidget *widget = gtk_invisible_new ();
|
||||
@ -180,7 +180,7 @@ make_clipboard_widget (gboolean provider)
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
static void
|
||||
ensure_clipboard_widget ()
|
||||
{
|
||||
if (!clipboard_widget)
|
||||
@ -492,7 +492,7 @@ gtk_clipboard_clear (GtkClipboard *clipboard)
|
||||
clipboard_get_timestamp (clipboard));
|
||||
}
|
||||
|
||||
void
|
||||
static void
|
||||
text_get_func (GtkClipboard *clipboard,
|
||||
GtkSelectionData *selection_data,
|
||||
guint info,
|
||||
@ -501,7 +501,7 @@ text_get_func (GtkClipboard *clipboard,
|
||||
gtk_selection_data_set_text (selection_data, data);
|
||||
}
|
||||
|
||||
void
|
||||
static void
|
||||
text_clear_func (GtkClipboard *clipboard,
|
||||
gpointer data)
|
||||
{
|
||||
|
||||
@ -1005,7 +1005,7 @@ get_screen_color (GtkWidget *button)
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
static void
|
||||
hex_changed (GtkWidget *hex_entry,
|
||||
gpointer data)
|
||||
{
|
||||
@ -1037,7 +1037,7 @@ hex_changed (GtkWidget *hex_entry,
|
||||
g_free (text);
|
||||
}
|
||||
|
||||
void
|
||||
static void
|
||||
hsv_changed (GtkWidget *hsv,
|
||||
gpointer data)
|
||||
{
|
||||
@ -1063,7 +1063,7 @@ hsv_changed (GtkWidget *hsv,
|
||||
update_color (colorsel);
|
||||
}
|
||||
|
||||
void
|
||||
static void
|
||||
adjustment_changed (GtkAdjustment *adjustment,
|
||||
gpointer data)
|
||||
{
|
||||
@ -1116,7 +1116,7 @@ adjustment_changed (GtkAdjustment *adjustment,
|
||||
update_color (colorsel);
|
||||
}
|
||||
|
||||
void
|
||||
static void
|
||||
opacity_entry_changed (GtkWidget *opacity_entry,
|
||||
gpointer data)
|
||||
{
|
||||
|
||||
@ -380,11 +380,11 @@ gtk_text_btree_new (GtkTextTagTable *table,
|
||||
line->parent = root_node;
|
||||
line->next = line2;
|
||||
|
||||
line->segments = char_segment_new("\n", 1);
|
||||
line->segments = _gtk_char_segment_new("\n", 1);
|
||||
|
||||
line2->parent = root_node;
|
||||
line2->next = NULL;
|
||||
line2->segments = char_segment_new("\n", 1);
|
||||
line2->segments = _gtk_char_segment_new("\n", 1);
|
||||
|
||||
/* Create the tree itself */
|
||||
|
||||
@ -975,7 +975,7 @@ gtk_text_btree_insert (GtkTextIter *iter,
|
||||
}
|
||||
chunkSize = eol - sol;
|
||||
|
||||
seg = char_segment_new(&text[sol], chunkSize);
|
||||
seg = _gtk_char_segment_new (&text[sol], chunkSize);
|
||||
|
||||
char_count_delta += seg->char_count;
|
||||
|
||||
@ -1068,7 +1068,7 @@ gtk_text_btree_insert_pixbuf (GtkTextIter *iter,
|
||||
tree = gtk_text_iter_get_btree(iter);
|
||||
start_byte_offset = gtk_text_iter_get_line_index(iter);
|
||||
|
||||
seg = _pixbuf_segment_new (pixbuf);
|
||||
seg = _gtk_pixbuf_segment_new (pixbuf);
|
||||
|
||||
prevPtr = gtk_text_line_segment_split(iter);
|
||||
if (prevPtr == NULL)
|
||||
@ -1572,7 +1572,7 @@ gtk_text_btree_tag (const GtkTextIter *start_orig,
|
||||
{
|
||||
/* This could create a second toggle at the start position;
|
||||
cleanup_line() will remove it if so. */
|
||||
seg = toggle_segment_new(info, add);
|
||||
seg = _gtk_toggle_segment_new(info, add);
|
||||
|
||||
prev = gtk_text_line_segment_split(&start);
|
||||
if (prev == NULL)
|
||||
@ -1679,8 +1679,8 @@ gtk_text_btree_tag (const GtkTextIter *start_orig,
|
||||
/* Update node counts */
|
||||
if (seg->body.toggle.inNodeCounts)
|
||||
{
|
||||
change_node_toggle_count(line->parent,
|
||||
info, -1);
|
||||
_gtk_change_node_toggle_count(line->parent,
|
||||
info, -1);
|
||||
seg->body.toggle.inNodeCounts = FALSE;
|
||||
}
|
||||
|
||||
@ -1707,7 +1707,7 @@ gtk_text_btree_tag (const GtkTextIter *start_orig,
|
||||
/* This could create a second toggle at the start position;
|
||||
cleanup_line() will remove it if so. */
|
||||
|
||||
seg = toggle_segment_new(info, !add);
|
||||
seg = _gtk_toggle_segment_new(info, !add);
|
||||
|
||||
prev = gtk_text_line_segment_split(&end);
|
||||
if (prev == NULL)
|
||||
@ -2462,9 +2462,9 @@ real_set_mark(GtkTextBTree *tree,
|
||||
}
|
||||
else
|
||||
{
|
||||
mark = _mark_segment_new (tree,
|
||||
left_gravity,
|
||||
name);
|
||||
mark = _gtk_mark_segment_new (tree,
|
||||
left_gravity,
|
||||
name);
|
||||
|
||||
mark->body.mark.line = gtk_text_iter_get_text_line(&iter);
|
||||
|
||||
@ -5775,9 +5775,9 @@ recompute_node_counts(GtkTextBTree *tree, GtkTextBTreeNode *node)
|
||||
}
|
||||
|
||||
void
|
||||
change_node_toggle_count(GtkTextBTreeNode *node,
|
||||
GtkTextTagInfo *info,
|
||||
gint delta) /* may be negative */
|
||||
_gtk_change_node_toggle_count(GtkTextBTreeNode *node,
|
||||
GtkTextTagInfo *info,
|
||||
gint delta) /* may be negative */
|
||||
{
|
||||
Summary *summary, *prevPtr;
|
||||
GtkTextBTreeNode *node2Ptr;
|
||||
@ -5836,8 +5836,8 @@ change_node_toggle_count(GtkTextBTreeNode *node,
|
||||
* first place).
|
||||
*/
|
||||
|
||||
g_error("change_node_toggle_count: bad toggle count (%d) max (%d)",
|
||||
summary->toggle_count, info->toggle_count);
|
||||
g_error("%s: bad toggle count (%d) max (%d)",
|
||||
G_STRLOC, summary->toggle_count, info->toggle_count);
|
||||
}
|
||||
|
||||
/*
|
||||
@ -6088,7 +6088,7 @@ gtk_text_btree_unlink_segment(GtkTextBTree *tree,
|
||||
/*
|
||||
*--------------------------------------------------------------
|
||||
*
|
||||
* toggle_segment_check_func --
|
||||
* _gtk_toggle_segment_check_func --
|
||||
*
|
||||
* This procedure is invoked to perform consistency checks
|
||||
* on toggle segments.
|
||||
@ -6103,8 +6103,8 @@ gtk_text_btree_unlink_segment(GtkTextBTree *tree,
|
||||
*/
|
||||
|
||||
void
|
||||
toggle_segment_check_func(GtkTextLineSegment *segPtr,
|
||||
GtkTextLine *line)
|
||||
_gtk_toggle_segment_check_func (GtkTextLineSegment *segPtr,
|
||||
GtkTextLine *line)
|
||||
{
|
||||
Summary *summary;
|
||||
int needSummary;
|
||||
|
||||
@ -262,11 +262,11 @@ void gtk_text_btree_spew (GtkTextBTree *tree);
|
||||
extern gboolean gtk_text_view_debug_btree;
|
||||
|
||||
/* ignore, exported only for gtktextsegment.c */
|
||||
void toggle_segment_check_func (GtkTextLineSegment *segPtr,
|
||||
GtkTextLine *line);
|
||||
void change_node_toggle_count (GtkTextBTreeNode *node,
|
||||
GtkTextTagInfo *info,
|
||||
gint delta);
|
||||
void _gtk_toggle_segment_check_func (GtkTextLineSegment *segPtr,
|
||||
GtkTextLine *line);
|
||||
void _gtk_change_node_toggle_count (GtkTextBTreeNode *node,
|
||||
GtkTextTagInfo *info,
|
||||
gint delta);
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
@ -101,7 +101,7 @@ GtkTextLineSegmentClass gtk_text_pixbuf_type = {
|
||||
+ sizeof(GtkTextPixbuf)))
|
||||
|
||||
GtkTextLineSegment *
|
||||
_pixbuf_segment_new (GdkPixbuf *pixbuf)
|
||||
_gtk_pixbuf_segment_new (GdkPixbuf *pixbuf)
|
||||
{
|
||||
GtkTextLineSegment *seg;
|
||||
|
||||
@ -137,7 +137,7 @@ child_segment_delete_func (GtkTextLineSegment *seg,
|
||||
GtkTextLine *line,
|
||||
gboolean tree_gone)
|
||||
{
|
||||
_widget_segment_unref (seg);
|
||||
_gtk_widget_segment_unref (seg);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@ -170,7 +170,7 @@ GtkTextLineSegmentClass gtk_text_child_type = {
|
||||
+ sizeof(GtkTextChildBody)))
|
||||
|
||||
GtkTextLineSegment *
|
||||
_widget_segment_new (void)
|
||||
_gtk_widget_segment_new (void)
|
||||
{
|
||||
GtkTextLineSegment *seg;
|
||||
|
||||
@ -194,7 +194,7 @@ _widget_segment_new (void)
|
||||
}
|
||||
|
||||
void
|
||||
_widget_segment_add (GtkTextLineSegment *widget_segment,
|
||||
_gtk_widget_segment_add (GtkTextLineSegment *widget_segment,
|
||||
GtkWidget *child)
|
||||
{
|
||||
g_assert (widget_segment->type = >k_text_child_type);
|
||||
@ -207,7 +207,7 @@ _widget_segment_add (GtkTextLineSegment *widget_segment,
|
||||
}
|
||||
|
||||
void
|
||||
_widget_segment_remove (GtkTextLineSegment *widget_segment,
|
||||
_gtk_widget_segment_remove (GtkTextLineSegment *widget_segment,
|
||||
GtkWidget *child)
|
||||
{
|
||||
g_assert (widget_segment->type = >k_text_child_type);
|
||||
@ -220,7 +220,7 @@ _widget_segment_remove (GtkTextLineSegment *widget_segment,
|
||||
}
|
||||
|
||||
void
|
||||
_widget_segment_ref (GtkTextLineSegment *widget_segment)
|
||||
_gtk_widget_segment_ref (GtkTextLineSegment *widget_segment)
|
||||
{
|
||||
g_assert (widget_segment->type = >k_text_child_type);
|
||||
|
||||
@ -228,7 +228,7 @@ _widget_segment_ref (GtkTextLineSegment *widget_segment)
|
||||
}
|
||||
|
||||
void
|
||||
_widget_segment_unref (GtkTextLineSegment *widget_segment)
|
||||
_gtk_widget_segment_unref (GtkTextLineSegment *widget_segment)
|
||||
{
|
||||
g_assert (widget_segment->type = >k_text_child_type);
|
||||
|
||||
@ -263,7 +263,7 @@ gtk_text_child_anchor_ref (GtkTextChildAnchor *anchor)
|
||||
g_return_if_fail (seg->type = >k_text_child_type);
|
||||
g_return_if_fail (seg->body.child.ref_count > 0);
|
||||
|
||||
_widget_segment_ref (seg);
|
||||
_gtk_widget_segment_ref (seg);
|
||||
}
|
||||
|
||||
void
|
||||
@ -274,7 +274,7 @@ gtk_text_child_anchor_unref (GtkTextChildAnchor *anchor)
|
||||
g_return_if_fail (seg->type = >k_text_child_type);
|
||||
g_return_if_fail (seg->body.child.ref_count > 0);
|
||||
|
||||
_widget_segment_unref (seg);
|
||||
_gtk_widget_segment_unref (seg);
|
||||
}
|
||||
|
||||
GList*
|
||||
|
||||
@ -63,7 +63,7 @@ struct _GtkTextPixbuf
|
||||
GdkPixbuf *pixbuf;
|
||||
};
|
||||
|
||||
GtkTextLineSegment *_pixbuf_segment_new (GdkPixbuf *pixbuf);
|
||||
GtkTextLineSegment *_gtk_pixbuf_segment_new (GdkPixbuf *pixbuf);
|
||||
|
||||
typedef struct _GtkTextChildBody GtkTextChildBody;
|
||||
|
||||
@ -75,13 +75,13 @@ struct _GtkTextChildBody
|
||||
GtkTextLine *line;
|
||||
};
|
||||
|
||||
GtkTextLineSegment *_widget_segment_new (void);
|
||||
void _widget_segment_add (GtkTextLineSegment *widget_segment,
|
||||
GtkWidget *child);
|
||||
void _widget_segment_remove (GtkTextLineSegment *widget_segment,
|
||||
GtkWidget *child);
|
||||
void _widget_segment_ref (GtkTextLineSegment *widget_segment);
|
||||
void _widget_segment_unref (GtkTextLineSegment *widget_segment);
|
||||
GtkTextLineSegment *_gtk_widget_segment_new (void);
|
||||
void _gtk_widget_segment_add (GtkTextLineSegment *widget_segment,
|
||||
GtkWidget *child);
|
||||
void _gtk_widget_segment_remove (GtkTextLineSegment *widget_segment,
|
||||
GtkWidget *child);
|
||||
void _gtk_widget_segment_ref (GtkTextLineSegment *widget_segment);
|
||||
void _gtk_widget_segment_unref (GtkTextLineSegment *widget_segment);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
||||
@ -3307,7 +3307,7 @@ my_strrstr (const gchar *haystack,
|
||||
}
|
||||
|
||||
if (n == needle_rend)
|
||||
return ++s;
|
||||
return (gchar*)++s;
|
||||
|
||||
--p;
|
||||
}
|
||||
|
||||
@ -171,9 +171,9 @@ gtk_text_mark_get_deleted (GtkTextMark *mark)
|
||||
|
||||
|
||||
GtkTextLineSegment*
|
||||
_mark_segment_new (GtkTextBTree *tree,
|
||||
gboolean left_gravity,
|
||||
const gchar *name)
|
||||
_gtk_mark_segment_new (GtkTextBTree *tree,
|
||||
gboolean left_gravity,
|
||||
const gchar *name)
|
||||
{
|
||||
GtkTextLineSegment *mark;
|
||||
|
||||
|
||||
@ -25,9 +25,9 @@ struct _GtkTextMarkBody {
|
||||
guint not_deleteable : 1;
|
||||
};
|
||||
|
||||
GtkTextLineSegment *_mark_segment_new (GtkTextBTree *tree,
|
||||
gboolean left_gravity,
|
||||
const gchar *name);
|
||||
GtkTextLineSegment *_gtk_mark_segment_new (GtkTextBTree *tree,
|
||||
gboolean left_gravity,
|
||||
const gchar *name);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
||||
@ -184,7 +184,7 @@ char_segment_self_check(GtkTextLineSegment *seg)
|
||||
}
|
||||
|
||||
GtkTextLineSegment*
|
||||
char_segment_new(const gchar *text, guint len)
|
||||
_gtk_char_segment_new(const gchar *text, guint len)
|
||||
{
|
||||
GtkTextLineSegment *seg;
|
||||
|
||||
@ -206,8 +206,8 @@ 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)
|
||||
_gtk_char_segment_new_from_two_strings(const gchar *text1, guint len1,
|
||||
const gchar *text2, guint len2)
|
||||
{
|
||||
GtkTextLineSegment *seg;
|
||||
|
||||
@ -262,8 +262,8 @@ char_segment_split_func(GtkTextLineSegment *seg, int index)
|
||||
char_segment_self_check(seg);
|
||||
}
|
||||
|
||||
new1 = char_segment_new(seg->body.chars, index);
|
||||
new2 = char_segment_new(seg->body.chars + index, seg->byte_count - index);
|
||||
new1 = _gtk_char_segment_new (seg->body.chars, index);
|
||||
new2 = _gtk_char_segment_new (seg->body.chars + index, seg->byte_count - index);
|
||||
|
||||
g_assert(gtk_text_byte_begins_utf8_char(new1->body.chars));
|
||||
g_assert(gtk_text_byte_begins_utf8_char(new2->body.chars));
|
||||
@ -320,8 +320,9 @@ char_segment_cleanup_func(segPtr, line)
|
||||
return segPtr;
|
||||
}
|
||||
|
||||
newPtr = char_segment_new_from_two_strings(segPtr->body.chars, segPtr->byte_count,
|
||||
segPtr2->body.chars, segPtr2->byte_count);
|
||||
newPtr =
|
||||
_gtk_char_segment_new_from_two_strings (segPtr->body.chars, segPtr->byte_count,
|
||||
segPtr2->body.chars, segPtr2->byte_count);
|
||||
|
||||
newPtr->next = segPtr2->next;
|
||||
|
||||
@ -405,7 +406,7 @@ char_segment_check_func(segPtr, line)
|
||||
}
|
||||
|
||||
GtkTextLineSegment*
|
||||
toggle_segment_new(GtkTextTagInfo *info, gboolean on)
|
||||
_gtk_toggle_segment_new(GtkTextTagInfo *info, gboolean on)
|
||||
{
|
||||
GtkTextLineSegment *seg;
|
||||
|
||||
@ -467,8 +468,8 @@ toggle_segment_delete_func(segPtr, line, treeGone)
|
||||
|
||||
if (segPtr->body.toggle.inNodeCounts)
|
||||
{
|
||||
change_node_toggle_count(line->parent,
|
||||
segPtr->body.toggle.info, -1);
|
||||
_gtk_change_node_toggle_count(line->parent,
|
||||
segPtr->body.toggle.info, -1);
|
||||
segPtr->body.toggle.inNodeCounts = 0;
|
||||
}
|
||||
return 1;
|
||||
@ -530,8 +531,8 @@ toggle_segment_cleanup_func(segPtr, line)
|
||||
+ segPtr2->body.toggle.inNodeCounts;
|
||||
if (counts != 0)
|
||||
{
|
||||
change_node_toggle_count(line->parent,
|
||||
segPtr->body.toggle.info, -counts);
|
||||
_gtk_change_node_toggle_count(line->parent,
|
||||
segPtr->body.toggle.info, -counts);
|
||||
}
|
||||
prevPtr->next = segPtr2->next;
|
||||
g_free((char *) segPtr2);
|
||||
@ -543,8 +544,8 @@ toggle_segment_cleanup_func(segPtr, line)
|
||||
|
||||
if (!segPtr->body.toggle.inNodeCounts)
|
||||
{
|
||||
change_node_toggle_count(line->parent,
|
||||
segPtr->body.toggle.info, 1);
|
||||
_gtk_change_node_toggle_count(line->parent,
|
||||
segPtr->body.toggle.info, 1);
|
||||
segPtr->body.toggle.inNodeCounts = 1;
|
||||
}
|
||||
return segPtr;
|
||||
@ -574,8 +575,8 @@ toggle_segment_line_change_func(segPtr, line)
|
||||
{
|
||||
if (segPtr->body.toggle.inNodeCounts)
|
||||
{
|
||||
change_node_toggle_count(line->parent,
|
||||
segPtr->body.toggle.info, -1);
|
||||
_gtk_change_node_toggle_count (line->parent,
|
||||
segPtr->body.toggle.info, -1);
|
||||
segPtr->body.toggle.inNodeCounts = 0;
|
||||
}
|
||||
}
|
||||
@ -607,7 +608,7 @@ GtkTextLineSegmentClass gtk_text_toggle_on_type = {
|
||||
toggle_segment_delete_func, /* deleteFunc */
|
||||
toggle_segment_cleanup_func, /* cleanupFunc */
|
||||
toggle_segment_line_change_func, /* lineChangeFunc */
|
||||
toggle_segment_check_func /* checkFunc */
|
||||
_gtk_toggle_segment_check_func /* checkFunc */
|
||||
};
|
||||
|
||||
/*
|
||||
@ -622,5 +623,5 @@ GtkTextLineSegmentClass gtk_text_toggle_off_type = {
|
||||
toggle_segment_delete_func, /* deleteFunc */
|
||||
toggle_segment_cleanup_func, /* cleanupFunc */
|
||||
toggle_segment_line_change_func, /* lineChangeFunc */
|
||||
toggle_segment_check_func /* checkFunc */
|
||||
_gtk_toggle_segment_check_func /* checkFunc */
|
||||
};
|
||||
|
||||
@ -130,14 +130,14 @@ struct _GtkTextLineSegment {
|
||||
|
||||
GtkTextLineSegment *gtk_text_line_segment_split (const GtkTextIter *iter);
|
||||
|
||||
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 *_gtk_char_segment_new (const gchar *text,
|
||||
guint len);
|
||||
GtkTextLineSegment *_gtk_char_segment_new_from_two_strings (const gchar *text1,
|
||||
guint len1,
|
||||
const gchar *text2,
|
||||
guint len2);
|
||||
GtkTextLineSegment *_gtk_toggle_segment_new (GtkTextTagInfo *info,
|
||||
gboolean on);
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
Loading…
Reference in New Issue
Block a user