diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 14 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 14 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 14 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 14 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 14 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 14 | ||||
| -rw-r--r-- | gtk/gtk-boxed.defs | 5 | ||||
| -rw-r--r-- | gtk/gtktextbtree.c | 5 | ||||
| -rw-r--r-- | gtk/gtktextiter.c | 10 | ||||
| -rw-r--r-- | gtk/gtktextlayout.c | 12 | ||||
| -rw-r--r-- | gtk/gtktexttag.c | 50 | ||||
| -rw-r--r-- | gtk/gtktexttag.h | 13 | ||||
| -rw-r--r-- | gtk/gtktexttagprivate.h | 26 |
14 files changed, 170 insertions, 49 deletions
@@ -1,5 +1,19 @@ 2001-01-01 Havoc Pennington <hp@redhat.com> + * gtk/gtktexttagprivate.h: uscore-prepend all the stuff in here. + + * gtk/gtk-boxed.defs (GtkTextAttributes): Add boxed type for + GtkTextAttributes + + * gtk/gtktexttag.c: Fix up GtkTextAttributes copying to close bug + #40246 + (gtk_text_attributes_copy_values): rename from + gtk_text_attributes_copy + (gtk_text_attributes_copy): a more standard GTK copy function, + which returns a new object + +2001-01-01 Havoc Pennington <hp@redhat.com> + * gtk/gtktreeview.c: Adapt to GtkTreeSelection changes * gtk/gtktreeselection.c (_gtk_tree_selection_set_tree_view): diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index aa0d86b73f..c8ee87334c 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,5 +1,19 @@ 2001-01-01 Havoc Pennington <hp@redhat.com> + * gtk/gtktexttagprivate.h: uscore-prepend all the stuff in here. + + * gtk/gtk-boxed.defs (GtkTextAttributes): Add boxed type for + GtkTextAttributes + + * gtk/gtktexttag.c: Fix up GtkTextAttributes copying to close bug + #40246 + (gtk_text_attributes_copy_values): rename from + gtk_text_attributes_copy + (gtk_text_attributes_copy): a more standard GTK copy function, + which returns a new object + +2001-01-01 Havoc Pennington <hp@redhat.com> + * gtk/gtktreeview.c: Adapt to GtkTreeSelection changes * gtk/gtktreeselection.c (_gtk_tree_selection_set_tree_view): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index aa0d86b73f..c8ee87334c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,19 @@ 2001-01-01 Havoc Pennington <hp@redhat.com> + * gtk/gtktexttagprivate.h: uscore-prepend all the stuff in here. + + * gtk/gtk-boxed.defs (GtkTextAttributes): Add boxed type for + GtkTextAttributes + + * gtk/gtktexttag.c: Fix up GtkTextAttributes copying to close bug + #40246 + (gtk_text_attributes_copy_values): rename from + gtk_text_attributes_copy + (gtk_text_attributes_copy): a more standard GTK copy function, + which returns a new object + +2001-01-01 Havoc Pennington <hp@redhat.com> + * gtk/gtktreeview.c: Adapt to GtkTreeSelection changes * gtk/gtktreeselection.c (_gtk_tree_selection_set_tree_view): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index aa0d86b73f..c8ee87334c 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,5 +1,19 @@ 2001-01-01 Havoc Pennington <hp@redhat.com> + * gtk/gtktexttagprivate.h: uscore-prepend all the stuff in here. + + * gtk/gtk-boxed.defs (GtkTextAttributes): Add boxed type for + GtkTextAttributes + + * gtk/gtktexttag.c: Fix up GtkTextAttributes copying to close bug + #40246 + (gtk_text_attributes_copy_values): rename from + gtk_text_attributes_copy + (gtk_text_attributes_copy): a more standard GTK copy function, + which returns a new object + +2001-01-01 Havoc Pennington <hp@redhat.com> + * gtk/gtktreeview.c: Adapt to GtkTreeSelection changes * gtk/gtktreeselection.c (_gtk_tree_selection_set_tree_view): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index aa0d86b73f..c8ee87334c 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,5 +1,19 @@ 2001-01-01 Havoc Pennington <hp@redhat.com> + * gtk/gtktexttagprivate.h: uscore-prepend all the stuff in here. + + * gtk/gtk-boxed.defs (GtkTextAttributes): Add boxed type for + GtkTextAttributes + + * gtk/gtktexttag.c: Fix up GtkTextAttributes copying to close bug + #40246 + (gtk_text_attributes_copy_values): rename from + gtk_text_attributes_copy + (gtk_text_attributes_copy): a more standard GTK copy function, + which returns a new object + +2001-01-01 Havoc Pennington <hp@redhat.com> + * gtk/gtktreeview.c: Adapt to GtkTreeSelection changes * gtk/gtktreeselection.c (_gtk_tree_selection_set_tree_view): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index aa0d86b73f..c8ee87334c 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,19 @@ 2001-01-01 Havoc Pennington <hp@redhat.com> + * gtk/gtktexttagprivate.h: uscore-prepend all the stuff in here. + + * gtk/gtk-boxed.defs (GtkTextAttributes): Add boxed type for + GtkTextAttributes + + * gtk/gtktexttag.c: Fix up GtkTextAttributes copying to close bug + #40246 + (gtk_text_attributes_copy_values): rename from + gtk_text_attributes_copy + (gtk_text_attributes_copy): a more standard GTK copy function, + which returns a new object + +2001-01-01 Havoc Pennington <hp@redhat.com> + * gtk/gtktreeview.c: Adapt to GtkTreeSelection changes * gtk/gtktreeselection.c (_gtk_tree_selection_set_tree_view): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index aa0d86b73f..c8ee87334c 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,19 @@ 2001-01-01 Havoc Pennington <hp@redhat.com> + * gtk/gtktexttagprivate.h: uscore-prepend all the stuff in here. + + * gtk/gtk-boxed.defs (GtkTextAttributes): Add boxed type for + GtkTextAttributes + + * gtk/gtktexttag.c: Fix up GtkTextAttributes copying to close bug + #40246 + (gtk_text_attributes_copy_values): rename from + gtk_text_attributes_copy + (gtk_text_attributes_copy): a more standard GTK copy function, + which returns a new object + +2001-01-01 Havoc Pennington <hp@redhat.com> + * gtk/gtktreeview.c: Adapt to GtkTreeSelection changes * gtk/gtktreeselection.c (_gtk_tree_selection_set_tree_view): diff --git a/gtk/gtk-boxed.defs b/gtk/gtk-boxed.defs index 83fc8d8d46..f995e0615f 100644 --- a/gtk/gtk-boxed.defs +++ b/gtk/gtk-boxed.defs @@ -1286,6 +1286,11 @@ gtk_text_iter_copy gtk_text_iter_free) + +(define-boxed GtkTextAttributes + gtk_text_attributes_ref + gtk_text_attributes_unref) + (define-boxed PangoTabArray pango_tab_array_copy pango_tab_array_free) diff --git a/gtk/gtktextbtree.c b/gtk/gtktextbtree.c index 97ea5ab425..93695fa515 100644 --- a/gtk/gtktextbtree.c +++ b/gtk/gtktextbtree.c @@ -1539,12 +1539,11 @@ queue_tag_redisplay (GtkTextBTree *tree, const GtkTextIter *start, const GtkTextIter *end) { - if (gtk_text_tag_affects_size (tag)) + if (_gtk_text_tag_affects_size (tag)) { _gtk_text_btree_invalidate_region (tree, start, end); - } - else if (gtk_text_tag_affects_nonsize_appearance (tag)) + else if (_gtk_text_tag_affects_nonsize_appearance (tag)) { /* We only need to queue a redraw, not a relayout */ redisplay_region (tree, start, end); diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c index 755fc033b2..eb6e2c3233 100644 --- a/gtk/gtktextiter.c +++ b/gtk/gtktextiter.c @@ -1207,7 +1207,7 @@ gtk_text_iter_get_tags (const GtkTextIter *iter) } /* Sort tags in ascending order of priority */ - gtk_text_tag_array_sort (tags, tag_count); + _gtk_text_tag_array_sort (tags, tag_count); retval = NULL; i = 0; @@ -1544,11 +1544,11 @@ gtk_text_iter_get_attributes (const GtkTextIter *iter, } /* Sort tags in ascending order of priority */ - gtk_text_tag_array_sort (tags, tag_count); + _gtk_text_tag_array_sort (tags, tag_count); - gtk_text_attributes_fill_from_tags (values, - tags, - tag_count); + _gtk_text_attributes_fill_from_tags (values, + tags, + tag_count); g_free (tags); diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c index 2ee16058cf..71c610ef40 100644 --- a/gtk/gtktextlayout.c +++ b/gtk/gtktextlayout.c @@ -945,16 +945,16 @@ get_style (GtkTextLayout *layout, } /* Sort tags in ascending order of priority */ - gtk_text_tag_array_sort (tags, tag_count); + _gtk_text_tag_array_sort (tags, tag_count); style = gtk_text_attributes_new (); - gtk_text_attributes_copy (layout->default_style, - style); + gtk_text_attributes_copy_values (layout->default_style, + style); - gtk_text_attributes_fill_from_tags (style, - tags, - tag_count); + _gtk_text_attributes_fill_from_tags (style, + tags, + tag_count); g_free (tags); diff --git a/gtk/gtktexttag.c b/gtk/gtktexttag.c index 794536439b..fd36a510bb 100644 --- a/gtk/gtktexttag.c +++ b/gtk/gtktexttag.c @@ -1587,8 +1587,8 @@ tag_sort_func (gconstpointer first, gconstpointer second) } void -gtk_text_tag_array_sort (GtkTextTag** tag_array_p, - guint len) +_gtk_text_tag_array_sort (GtkTextTag** tag_array_p, + guint len) { int i, j, prio; GtkTextTag **tag; @@ -1664,10 +1664,28 @@ gtk_text_attributes_new (void) return values; } -/* FIXME change the signature of this to be correct */ +GtkTextAttributes* +gtk_text_attributes_copy (GtkTextAttributes *src) +{ + GtkTextAttributes *dest; + + dest = gtk_text_attributes_new (); + gtk_text_attributes_copy_values (src, dest); + + return dest; +} + +/** + * gtk_text_attributes_copy_values: + * @src: a #GtkTextAttributes + * @dest: another #GtkTextAttributes + * + * Copies the values from @src to @dest so that @dest has the same values + * as @src. + **/ void -gtk_text_attributes_copy (GtkTextAttributes *src, - GtkTextAttributes *dest) +gtk_text_attributes_copy_values (GtkTextAttributes *src, + GtkTextAttributes *dest) { guint orig_refcount; @@ -1754,9 +1772,9 @@ gtk_text_attributes_unref (GtkTextAttributes *values) } void -gtk_text_attributes_realize (GtkTextAttributes *values, - GdkColormap *cmap, - GdkVisual *visual) +_gtk_text_attributes_realize (GtkTextAttributes *values, + GdkColormap *cmap, + GdkVisual *visual) { g_return_if_fail (values != NULL); g_return_if_fail (values->refcount > 0); @@ -1775,9 +1793,9 @@ gtk_text_attributes_realize (GtkTextAttributes *values, } void -gtk_text_attributes_unrealize (GtkTextAttributes *values, - GdkColormap *cmap, - GdkVisual *visual) +_gtk_text_attributes_unrealize (GtkTextAttributes *values, + GdkColormap *cmap, + GdkVisual *visual) { g_return_if_fail (values != NULL); g_return_if_fail (values->refcount > 0); @@ -1797,9 +1815,9 @@ gtk_text_attributes_unrealize (GtkTextAttributes *values, } void -gtk_text_attributes_fill_from_tags (GtkTextAttributes *dest, - GtkTextTag** tags, - guint n_tags) +_gtk_text_attributes_fill_from_tags (GtkTextAttributes *dest, + GtkTextTag** tags, + guint n_tags) { guint n = 0; @@ -1926,7 +1944,7 @@ gtk_text_attributes_fill_from_tags (GtkTextAttributes *dest, } gboolean -gtk_text_tag_affects_size (GtkTextTag *tag) +_gtk_text_tag_affects_size (GtkTextTag *tag) { g_return_val_if_fail (GTK_IS_TEXT_TAG (tag), FALSE); @@ -1952,7 +1970,7 @@ gtk_text_tag_affects_size (GtkTextTag *tag) } gboolean -gtk_text_tag_affects_nonsize_appearance (GtkTextTag *tag) +_gtk_text_tag_affects_nonsize_appearance (GtkTextTag *tag) { g_return_val_if_fail (GTK_IS_TEXT_TAG (tag), FALSE); diff --git a/gtk/gtktexttag.h b/gtk/gtktexttag.h index 0e7ef96210..2b92cda968 100644 --- a/gtk/gtktexttag.h +++ b/gtk/gtktexttag.h @@ -195,12 +195,13 @@ struct _GtkTextAttributes guint pad4 : 1; }; -/* FIXME _copy() has the wrong signature */ -GtkTextAttributes *gtk_text_attributes_new (void); -void gtk_text_attributes_copy (GtkTextAttributes *src, - GtkTextAttributes *dest); -void gtk_text_attributes_unref (GtkTextAttributes *values); -void gtk_text_attributes_ref (GtkTextAttributes *values); +GtkTextAttributes* gtk_text_attributes_new (void); +GtkTextAttributes* gtk_text_attributes_copy (GtkTextAttributes *src); +void gtk_text_attributes_copy_values (GtkTextAttributes *src, + GtkTextAttributes *dest); +void gtk_text_attributes_unref (GtkTextAttributes *values); +void gtk_text_attributes_ref (GtkTextAttributes *values); + #ifdef __cplusplus } diff --git a/gtk/gtktexttagprivate.h b/gtk/gtktexttagprivate.h index 3e95017af9..a7305f5c42 100644 --- a/gtk/gtktexttagprivate.h +++ b/gtk/gtktexttagprivate.h @@ -7,23 +7,23 @@ * the defaults with settings in the given tags, which should be sorted in * ascending order of priority */ -void gtk_text_attributes_fill_from_tags (GtkTextAttributes *values, - GtkTextTag **tags, - guint n_tags); -void gtk_text_tag_array_sort (GtkTextTag **tag_array_p, - guint len); +void _gtk_text_attributes_fill_from_tags (GtkTextAttributes *values, + GtkTextTag **tags, + guint n_tags); +void _gtk_text_tag_array_sort (GtkTextTag **tag_array_p, + guint len); /* ensure colors are allocated, etc. for drawing */ -void gtk_text_attributes_realize (GtkTextAttributes *values, - GdkColormap *cmap, - GdkVisual *visual); +void _gtk_text_attributes_realize (GtkTextAttributes *values, + GdkColormap *cmap, + GdkVisual *visual); /* free the stuff again */ -void gtk_text_attributes_unrealize (GtkTextAttributes *values, - GdkColormap *cmap, - GdkVisual *visual); +void _gtk_text_attributes_unrealize (GtkTextAttributes *values, + GdkColormap *cmap, + GdkVisual *visual); -gboolean gtk_text_tag_affects_size (GtkTextTag *tag); -gboolean gtk_text_tag_affects_nonsize_appearance (GtkTextTag *tag); +gboolean _gtk_text_tag_affects_size (GtkTextTag *tag); +gboolean _gtk_text_tag_affects_nonsize_appearance (GtkTextTag *tag); #endif |