Commit 5c379067 authored by Havoc Pennington's avatar Havoc Pennington Committed by Havoc Pennington

hack on this a bit


2001-01-05  Havoc Pennington  <hp@redhat.com>

	* tests/testtreeview.c: hack on this a bit

	* gtk/gtktextlayout.c (gtk_text_layout_class_init):
	s/GTK_RUN_LAST/G_SIGNAL_RUN_LAST

	* gtk/gtktreemodelsimple.h (GTK_IS_TREE_MODEL_SIMPLE_CLASS):
	was spelled incorrectly
	(GTK_IS_TREE_MODEL_SIMPLE): ditto

	* gtk/gtktreeview.c (gtk_tree_view_set_headers_clickable): rename
	from gtk_tree_view_set_headers_active

	* gtk/gtktexttag.c:
	(gtk_text_tag_get_property): handle PROP_DIRECTION
	(gtk_text_tag_set_property): g_object_notify when we toggle the _set
	properties, bug 40235

	* gtk/gtktextiter.c (gtk_text_iter_forward_to_delimiters): rename
	forward_to_line_end
parent eb2fdbb1
2001-01-05 Havoc Pennington <hp@redhat.com>
* tests/testtreeview.c: hack on this a bit
* gtk/gtktextlayout.c (gtk_text_layout_class_init):
s/GTK_RUN_LAST/G_SIGNAL_RUN_LAST
* gtk/gtktreemodelsimple.h (GTK_IS_TREE_MODEL_SIMPLE_CLASS):
was spelled incorrectly
(GTK_IS_TREE_MODEL_SIMPLE): ditto
* gtk/gtktreeview.c (gtk_tree_view_set_headers_clickable): rename
from gtk_tree_view_set_headers_active
* gtk/gtktexttag.c:
(gtk_text_tag_get_property): handle PROP_DIRECTION
(gtk_text_tag_set_property): g_object_notify when we toggle the _set
properties, bug 40235
* gtk/gtktextiter.c (gtk_text_iter_forward_to_delimiters): rename
forward_to_line_end
Fri Jan 5 16:16:29 2001 Owen Taylor <otaylor@redhat.com>
* gtk/{gtkcalender.c,gtkfilesel.c,gtkimcontext.c},
modules/input/gtkimcontextxim.c: Adopt to new prototypes
modules/input/gtkimcontextxim.c: Adapt to new prototypes
for unicode,locale,filename conversion functions.
2001-01-05 Havoc Pennington <hp@redhat.com>
......
2001-01-05 Havoc Pennington <hp@redhat.com>
* tests/testtreeview.c: hack on this a bit
* gtk/gtktextlayout.c (gtk_text_layout_class_init):
s/GTK_RUN_LAST/G_SIGNAL_RUN_LAST
* gtk/gtktreemodelsimple.h (GTK_IS_TREE_MODEL_SIMPLE_CLASS):
was spelled incorrectly
(GTK_IS_TREE_MODEL_SIMPLE): ditto
* gtk/gtktreeview.c (gtk_tree_view_set_headers_clickable): rename
from gtk_tree_view_set_headers_active
* gtk/gtktexttag.c:
(gtk_text_tag_get_property): handle PROP_DIRECTION
(gtk_text_tag_set_property): g_object_notify when we toggle the _set
properties, bug 40235
* gtk/gtktextiter.c (gtk_text_iter_forward_to_delimiters): rename
forward_to_line_end
Fri Jan 5 16:16:29 2001 Owen Taylor <otaylor@redhat.com>
* gtk/{gtkcalender.c,gtkfilesel.c,gtkimcontext.c},
modules/input/gtkimcontextxim.c: Adopt to new prototypes
modules/input/gtkimcontextxim.c: Adapt to new prototypes
for unicode,locale,filename conversion functions.
2001-01-05 Havoc Pennington <hp@redhat.com>
......
2001-01-05 Havoc Pennington <hp@redhat.com>
* tests/testtreeview.c: hack on this a bit
* gtk/gtktextlayout.c (gtk_text_layout_class_init):
s/GTK_RUN_LAST/G_SIGNAL_RUN_LAST
* gtk/gtktreemodelsimple.h (GTK_IS_TREE_MODEL_SIMPLE_CLASS):
was spelled incorrectly
(GTK_IS_TREE_MODEL_SIMPLE): ditto
* gtk/gtktreeview.c (gtk_tree_view_set_headers_clickable): rename
from gtk_tree_view_set_headers_active
* gtk/gtktexttag.c:
(gtk_text_tag_get_property): handle PROP_DIRECTION
(gtk_text_tag_set_property): g_object_notify when we toggle the _set
properties, bug 40235
* gtk/gtktextiter.c (gtk_text_iter_forward_to_delimiters): rename
forward_to_line_end
Fri Jan 5 16:16:29 2001 Owen Taylor <otaylor@redhat.com>
* gtk/{gtkcalender.c,gtkfilesel.c,gtkimcontext.c},
modules/input/gtkimcontextxim.c: Adopt to new prototypes
modules/input/gtkimcontextxim.c: Adapt to new prototypes
for unicode,locale,filename conversion functions.
2001-01-05 Havoc Pennington <hp@redhat.com>
......
2001-01-05 Havoc Pennington <hp@redhat.com>
* tests/testtreeview.c: hack on this a bit
* gtk/gtktextlayout.c (gtk_text_layout_class_init):
s/GTK_RUN_LAST/G_SIGNAL_RUN_LAST
* gtk/gtktreemodelsimple.h (GTK_IS_TREE_MODEL_SIMPLE_CLASS):
was spelled incorrectly
(GTK_IS_TREE_MODEL_SIMPLE): ditto
* gtk/gtktreeview.c (gtk_tree_view_set_headers_clickable): rename
from gtk_tree_view_set_headers_active
* gtk/gtktexttag.c:
(gtk_text_tag_get_property): handle PROP_DIRECTION
(gtk_text_tag_set_property): g_object_notify when we toggle the _set
properties, bug 40235
* gtk/gtktextiter.c (gtk_text_iter_forward_to_delimiters): rename
forward_to_line_end
Fri Jan 5 16:16:29 2001 Owen Taylor <otaylor@redhat.com>
* gtk/{gtkcalender.c,gtkfilesel.c,gtkimcontext.c},
modules/input/gtkimcontextxim.c: Adopt to new prototypes
modules/input/gtkimcontextxim.c: Adapt to new prototypes
for unicode,locale,filename conversion functions.
2001-01-05 Havoc Pennington <hp@redhat.com>
......
2001-01-05 Havoc Pennington <hp@redhat.com>
* tests/testtreeview.c: hack on this a bit
* gtk/gtktextlayout.c (gtk_text_layout_class_init):
s/GTK_RUN_LAST/G_SIGNAL_RUN_LAST
* gtk/gtktreemodelsimple.h (GTK_IS_TREE_MODEL_SIMPLE_CLASS):
was spelled incorrectly
(GTK_IS_TREE_MODEL_SIMPLE): ditto
* gtk/gtktreeview.c (gtk_tree_view_set_headers_clickable): rename
from gtk_tree_view_set_headers_active
* gtk/gtktexttag.c:
(gtk_text_tag_get_property): handle PROP_DIRECTION
(gtk_text_tag_set_property): g_object_notify when we toggle the _set
properties, bug 40235
* gtk/gtktextiter.c (gtk_text_iter_forward_to_delimiters): rename
forward_to_line_end
Fri Jan 5 16:16:29 2001 Owen Taylor <otaylor@redhat.com>
* gtk/{gtkcalender.c,gtkfilesel.c,gtkimcontext.c},
modules/input/gtkimcontextxim.c: Adopt to new prototypes
modules/input/gtkimcontextxim.c: Adapt to new prototypes
for unicode,locale,filename conversion functions.
2001-01-05 Havoc Pennington <hp@redhat.com>
......
2001-01-05 Havoc Pennington <hp@redhat.com>
* tests/testtreeview.c: hack on this a bit
* gtk/gtktextlayout.c (gtk_text_layout_class_init):
s/GTK_RUN_LAST/G_SIGNAL_RUN_LAST
* gtk/gtktreemodelsimple.h (GTK_IS_TREE_MODEL_SIMPLE_CLASS):
was spelled incorrectly
(GTK_IS_TREE_MODEL_SIMPLE): ditto
* gtk/gtktreeview.c (gtk_tree_view_set_headers_clickable): rename
from gtk_tree_view_set_headers_active
* gtk/gtktexttag.c:
(gtk_text_tag_get_property): handle PROP_DIRECTION
(gtk_text_tag_set_property): g_object_notify when we toggle the _set
properties, bug 40235
* gtk/gtktextiter.c (gtk_text_iter_forward_to_delimiters): rename
forward_to_line_end
Fri Jan 5 16:16:29 2001 Owen Taylor <otaylor@redhat.com>
* gtk/{gtkcalender.c,gtkfilesel.c,gtkimcontext.c},
modules/input/gtkimcontextxim.c: Adopt to new prototypes
modules/input/gtkimcontextxim.c: Adapt to new prototypes
for unicode,locale,filename conversion functions.
2001-01-05 Havoc Pennington <hp@redhat.com>
......
2001-01-05 Havoc Pennington <hp@redhat.com>
* tests/testtreeview.c: hack on this a bit
* gtk/gtktextlayout.c (gtk_text_layout_class_init):
s/GTK_RUN_LAST/G_SIGNAL_RUN_LAST
* gtk/gtktreemodelsimple.h (GTK_IS_TREE_MODEL_SIMPLE_CLASS):
was spelled incorrectly
(GTK_IS_TREE_MODEL_SIMPLE): ditto
* gtk/gtktreeview.c (gtk_tree_view_set_headers_clickable): rename
from gtk_tree_view_set_headers_active
* gtk/gtktexttag.c:
(gtk_text_tag_get_property): handle PROP_DIRECTION
(gtk_text_tag_set_property): g_object_notify when we toggle the _set
properties, bug 40235
* gtk/gtktextiter.c (gtk_text_iter_forward_to_delimiters): rename
forward_to_line_end
Fri Jan 5 16:16:29 2001 Owen Taylor <otaylor@redhat.com>
* gtk/{gtkcalender.c,gtkfilesel.c,gtkimcontext.c},
modules/input/gtkimcontextxim.c: Adopt to new prototypes
modules/input/gtkimcontextxim.c: Adapt to new prototypes
for unicode,locale,filename conversion functions.
2001-01-05 Havoc Pennington <hp@redhat.com>
......
......@@ -2962,7 +2962,7 @@ gtk_text_iter_forward_to_end (GtkTextIter *iter)
}
/**
* gtk_text_iter_forward_to_delimiters:
* gtk_text_iter_forward_to_line_end:
* @iter: a #GtkTextIter
*
* Moves the iterator to point to the paragraph delimiter characters,
......@@ -2975,7 +2975,7 @@ gtk_text_iter_forward_to_end (GtkTextIter *iter)
* Return value: %TRUE if we moved and the new location is not the end iterator
**/
gboolean
gtk_text_iter_forward_to_delimiters (GtkTextIter *iter)
gtk_text_iter_forward_to_line_end (GtkTextIter *iter)
{
gint current_offset;
gint new_offset;
......@@ -3001,7 +3001,7 @@ gtk_text_iter_forward_to_delimiters (GtkTextIter *iter)
* empty lines.
*/
if (!gtk_text_iter_ends_line (iter))
gtk_text_iter_forward_to_delimiters (iter);
gtk_text_iter_forward_to_line_end (iter);
return TRUE;
}
else
......
......@@ -185,7 +185,7 @@ void gtk_text_iter_set_line_offset (GtkTextIter *iter,
void gtk_text_iter_set_line_index (GtkTextIter *iter,
gint byte_on_line);
void gtk_text_iter_forward_to_end (GtkTextIter *iter);
gboolean gtk_text_iter_forward_to_delimiters (GtkTextIter *iter);
gboolean gtk_text_iter_forward_to_line_end (GtkTextIter *iter);
/* returns TRUE if a toggle was found; NULL for the tag pointer
......
......@@ -174,7 +174,7 @@ gtk_text_layout_class_init (GtkTextLayoutClass *klass)
signals[INVALIDATED] =
g_signal_newc ("invalidated",
G_TYPE_FROM_CLASS (object_class),
GTK_RUN_LAST,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTextLayoutClass, invalidated),
NULL,
gtk_marshal_VOID__VOID,
......@@ -184,7 +184,7 @@ gtk_text_layout_class_init (GtkTextLayoutClass *klass)
signals[CHANGED] =
g_signal_newc ("changed",
G_TYPE_FROM_CLASS (object_class),
GTK_RUN_LAST,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTextLayoutClass, changed),
NULL,
gtk_marshal_VOID__INT_INT_INT,
......@@ -197,7 +197,7 @@ gtk_text_layout_class_init (GtkTextLayoutClass *klass)
signals[ALLOCATE_CHILD] =
g_signal_newc ("allocate_child",
G_TYPE_FROM_CLASS (object_class),
GTK_RUN_LAST,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTextLayoutClass, allocate_child),
NULL,
gtk_marshal_VOID__OBJECT_INT_INT,
......@@ -1956,7 +1956,7 @@ line_display_index_to_iter (GtkTextLayout *layout,
iter, display->line, 0);
if (!gtk_text_iter_ends_line (iter))
gtk_text_iter_forward_to_delimiters (iter);
gtk_text_iter_forward_to_line_end (iter);
}
/* FIXME should this be cursor positions? */
......
......@@ -558,7 +558,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
ADD_SET_PROP ("justify_set", PROP_JUSTIFY_SET,
_("Justification set"),
_("Whether this tag affects paragraph justification"));
ADD_SET_PROP ("language_set", PROP_LANGUAGE_SET,
_("Language set"),
_("Whether this tag affects the language the text is rendered as"));
......@@ -683,12 +683,21 @@ set_bg_color (GtkTextTag *tag, GdkColor *color)
{
if (color)
{
tag->bg_color_set = TRUE;
if (!tag->bg_color_set)
{
tag->bg_color_set = TRUE;
g_object_notify (G_OBJECT (tag), "bg_color_set");
}
tag->values->appearance.bg_color = *color;
}
else
{
tag->bg_color_set = FALSE;
if (tag->bg_color_set)
{
tag->bg_color_set = FALSE;
g_object_notify (G_OBJECT (tag), "bg_color_set");
}
}
}
......@@ -697,12 +706,20 @@ set_fg_color (GtkTextTag *tag, GdkColor *color)
{
if (color)
{
tag->fg_color_set = TRUE;
if (!tag->fg_color_set)
{
tag->fg_color_set = TRUE;
g_object_notify (G_OBJECT (tag), "fg_color_set");
}
tag->values->appearance.fg_color = *color;
}
else
{
tag->fg_color_set = FALSE;
if (tag->fg_color_set)
{
tag->fg_color_set = FALSE;
g_object_notify (G_OBJECT (tag), "fg_color_set");
}
}
}
......@@ -734,13 +751,37 @@ set_font_description (GtkTextTag *text_tag,
NULL);
}
else
{
text_tag->family_set = FALSE;
text_tag->style_set = FALSE;
text_tag->variant_set = FALSE;
text_tag->weight_set = FALSE;
text_tag->stretch_set = FALSE;
text_tag->size_set = FALSE;
{
if (text_tag->family_set)
{
text_tag->family_set = FALSE;
g_object_notify (G_OBJECT (text_tag), "family_set");
}
if (text_tag->style_set)
{
text_tag->style_set = FALSE;
g_object_notify (G_OBJECT (text_tag), "style_set");
}
if (text_tag->variant_set)
{
text_tag->variant_set = FALSE;
g_object_notify (G_OBJECT (text_tag), "variant_set");
}
if (text_tag->weight_set)
{
text_tag->weight_set = FALSE;
g_object_notify (G_OBJECT (text_tag), "weight_set");
}
if (text_tag->stretch_set)
{
text_tag->stretch_set = FALSE;
g_object_notify (G_OBJECT (text_tag), "stretch_set");
}
if (text_tag->size_set)
{
text_tag->size_set = FALSE;
g_object_notify (G_OBJECT (text_tag), "size_set");
}
}
}
......@@ -806,7 +847,8 @@ gtk_text_tag_set_property (GObject *object,
GdkBitmap *bitmap = g_value_get_as_pointer (value);
text_tag->bg_stipple_set = TRUE;
g_object_notify (G_OBJECT (text_tag), "bg_stipple_set");
if (text_tag->values->appearance.bg_stipple != bitmap)
{
if (bitmap != NULL)
......@@ -825,6 +867,7 @@ gtk_text_tag_set_property (GObject *object,
GdkBitmap *bitmap = g_value_get_as_pointer (value);
text_tag->fg_stipple_set = TRUE;
g_object_notify (G_OBJECT (text_tag), "fg_stipple_set");
if (text_tag->values->appearance.fg_stipple != bitmap)
{
......@@ -875,77 +918,90 @@ gtk_text_tag_set_property (GObject *object,
g_free (text_tag->values->font.family_name);
text_tag->values->font.family_name = g_strdup (g_value_get_string (value));
text_tag->family_set = TRUE;
g_object_notify (G_OBJECT (text_tag), "family_set");
size_changed = TRUE;
break;
case PROP_STYLE:
text_tag->values->font.style = g_value_get_enum (value);
text_tag->style_set = TRUE;
g_object_notify (G_OBJECT (text_tag), "style_set");
size_changed = TRUE;
break;
case PROP_VARIANT:
text_tag->values->font.variant = g_value_get_enum (value);
text_tag->variant_set = TRUE;
g_object_notify (G_OBJECT (text_tag), "variant_set");
size_changed = TRUE;
break;
case PROP_WEIGHT:
text_tag->values->font.weight = g_value_get_int (value);
text_tag->weight_set = TRUE;
g_object_notify (G_OBJECT (text_tag), "weight_set");
size_changed = TRUE;
break;
case PROP_STRETCH:
text_tag->values->font.stretch = g_value_get_enum (value);
text_tag->stretch_set = TRUE;
g_object_notify (G_OBJECT (text_tag), "stretch_set");
size_changed = TRUE;
break;
case PROP_SIZE:
text_tag->values->font.size = g_value_get_int (value);
text_tag->size_set = TRUE;
g_object_notify (G_OBJECT (text_tag), "size_set");
size_changed = TRUE;
break;
case PROP_SIZE_POINTS:
text_tag->values->font.size = g_value_get_double (value) * PANGO_SCALE;
text_tag->size_set = TRUE;
g_object_notify (G_OBJECT (text_tag), "size_set");
size_changed = TRUE;
break;
case PROP_PIXELS_ABOVE_LINES:
text_tag->pixels_above_lines_set = TRUE;
text_tag->values->pixels_above_lines = g_value_get_int (value);
g_object_notify (G_OBJECT (text_tag), "pixels_above_lines_set");
size_changed = TRUE;
break;
case PROP_PIXELS_BELOW_LINES:
text_tag->pixels_below_lines_set = TRUE;
text_tag->values->pixels_below_lines = g_value_get_int (value);
g_object_notify (G_OBJECT (text_tag), "pixels_below_lines_set");
size_changed = TRUE;
break;
case PROP_PIXELS_INSIDE_WRAP:
text_tag->pixels_inside_wrap_set = TRUE;
text_tag->values->pixels_inside_wrap = g_value_get_int (value);
g_object_notify (G_OBJECT (text_tag), "pixels_inside_wrap_set");
size_changed = TRUE;
break;
case PROP_EDITABLE:
text_tag->editable_set = TRUE;
text_tag->values->editable = g_value_get_boolean (value);
g_object_notify (G_OBJECT (text_tag), "editable_set");
break;
case PROP_WRAP_MODE:
text_tag->wrap_mode_set = TRUE;
text_tag->values->wrap_mode = g_value_get_enum (value);
g_object_notify (G_OBJECT (text_tag), "wrap_mode_set");
size_changed = TRUE;
break;
case PROP_JUSTIFY:
text_tag->justify_set = TRUE;
text_tag->values->justify = g_value_get_enum (value);
g_object_notify (G_OBJECT (text_tag), "justify_set");
size_changed = TRUE;
break;
......@@ -956,45 +1012,53 @@ gtk_text_tag_set_property (GObject *object,
case PROP_LEFT_MARGIN:
text_tag->left_margin_set = TRUE;
text_tag->values->left_margin = g_value_get_int (value);
g_object_notify (G_OBJECT (text_tag), "left_margin_set");
size_changed = TRUE;
break;
case PROP_INDENT:
text_tag->indent_set = TRUE;
text_tag->values->indent = g_value_get_int (value);
g_object_notify (G_OBJECT (text_tag), "indent_set");
size_changed = TRUE;
break;
case PROP_STRIKETHROUGH:
text_tag->strikethrough_set = TRUE;
text_tag->values->appearance.strikethrough = g_value_get_boolean (value);
g_object_notify (G_OBJECT (text_tag), "strikethrough_set");
break;
case PROP_RIGHT_MARGIN:
text_tag->right_margin_set = TRUE;
text_tag->values->right_margin = g_value_get_int (value);
g_object_notify (G_OBJECT (text_tag), "right_margin_set");
size_changed = TRUE;
break;
case PROP_UNDERLINE:
text_tag->underline_set = TRUE;
text_tag->values->appearance.underline = g_value_get_enum (value);
g_object_notify (G_OBJECT (text_tag), "underline_set");
break;
case PROP_RISE:
text_tag->rise_set = TRUE;
text_tag->values->appearance.rise = g_value_get_int (value);
size_changed = TRUE;
g_object_notify (G_OBJECT (text_tag), "rise_set");
size_changed = TRUE;
break;
case PROP_BG_FULL_HEIGHT:
text_tag->bg_full_height_set = TRUE;
text_tag->values->bg_full_height = g_value_get_boolean (value);
g_object_notify (G_OBJECT (text_tag), "bg_full_height_set");
break;
case PROP_LANGUAGE:
text_tag->language_set = TRUE;
text_tag->values->language = g_strdup (g_value_get_string (value));
g_object_notify (G_OBJECT (text_tag), "language_set");
break;
case PROP_TABS:
......@@ -1007,12 +1071,15 @@ gtk_text_tag_set_property (GObject *object,
text_tag->values->tabs =
pango_tab_array_copy (g_value_get_as_pointer (value));
g_object_notify (G_OBJECT (text_tag), "tabs_set");
size_changed = TRUE;
break;
case PROP_INVISIBLE:
text_tag->invisible_set = TRUE;
text_tag->values->invisible = g_value_get_boolean (value);
g_object_notify (G_OBJECT (text_tag), "invisible_set");
size_changed = TRUE;
break;
......@@ -1106,7 +1173,7 @@ gtk_text_tag_set_property (GObject *object,
text_tag->justify_set = g_value_get_boolean (value);
size_changed = TRUE;
break;
case PROP_LEFT_MARGIN_SET:
text_tag->left_margin_set = g_value_get_boolean (value);
size_changed = TRUE;
......@@ -1300,6 +1367,10 @@ gtk_text_tag_get_property (GObject *object,
g_value_set_enum (value, tag->values->justify);
break;
case PROP_DIRECTION:
g_value_set_enum (value, tag->values->direction);
break;
case PROP_LEFT_MARGIN:
g_value_set_int (value, tag->values->left_margin);
break;
......@@ -1406,7 +1477,7 @@ gtk_text_tag_get_property (GObject *object,
case PROP_JUSTIFY_SET:
g_value_set_boolean (value, tag->justify_set);
break;
case PROP_LEFT_MARGIN_SET:
g_value_set_boolean (value, tag->left_margin_set);
break;
......
......@@ -3317,7 +3317,7 @@ gtk_text_view_move_cursor (GtkTextView *text_view,
case GTK_MOVEMENT_PARAGRAPH_ENDS:
if (count > 0)
gtk_text_iter_forward_to_delimiters (&newplace);
gtk_text_iter_forward_to_line_end (&newplace);
else if (count < 0)
gtk_text_iter_set_line_offset (&newplace, 0);
break;
......@@ -3521,7 +3521,7 @@ gtk_text_view_delete_from_cursor (GtkTextView *text_view,
while (count > 0)
{
if (!gtk_text_iter_forward_to_delimiters (&end))
if (!gtk_text_iter_forward_to_line_end (&end))
break;
--count;
......@@ -3535,12 +3535,12 @@ gtk_text_view_delete_from_cursor (GtkTextView *text_view,
if (count > 0)
{
gtk_text_iter_set_line_offset (&start, 0);
gtk_text_iter_forward_to_delimiters (&end);
gtk_text_iter_forward_to_line_end (&end);
/* Do the lines beyond the first. */
while (count > 1)
{
gtk_text_iter_forward_to_delimiters (&end);
gtk_text_iter_forward_to_line_end (&end);
--count;
}
......
......@@ -451,7 +451,7 @@ gtk_tree_model_simple_changed (GtkTreeModelSimple *simple,
GtkTreeIter *iter)
{
g_return_if_fail (simple != NULL);
g_return_if_fail (GTK_IS_MODEL_SIMPLE (simple));
g_return_if_fail (GTK_IS_TREE_MODEL_SIMPLE (simple));
g_return_if_fail (path != NULL);
gtk_signal_emit_by_name (GTK_OBJECT (simple), "changed", path, iter);
......@@ -463,7 +463,7 @@ gtk_tree_model_simple_inserted (GtkTreeModelSimple *simple,
GtkTreeIter *iter)
{
g_return_if_fail (simple != NULL);
g_return_if_fail (GTK_IS_MODEL_SIMPLE (simple));
g_return_if_fail (GTK_IS_TREE_MODEL_SIMPLE (simple));
g_return_if_fail (path != NULL);
gtk_signal_emit_by_name (GTK_OBJECT (simple), "inserted", path, iter);
......@@ -475,7 +475,7 @@ gtk_tree_model_simple_child_toggled (GtkTreeModelSimple *simple,
GtkTreeIter *iter)
{
g_return_if_fail (simple != NULL);
g_return_if_fail (GTK_IS_MODEL_SIMPLE (simple));
g_return_if_fail (GTK_IS_TREE_MODEL_SIMPLE (simple));
g_return_if_fail (path != NULL);
gtk_signal_emit_by_name (GTK_OBJECT (simple), "child_toggled", path, iter);
......@@ -487,7 +487,7 @@ gtk_tree_model_simple_iter_deleted (GtkTreeModelSimple *simple,
GtkTreeIter *iter)
{
g_return_if_fail (simple != NULL);
g_return_if_fail (GTK_IS_MODEL_SIMPLE (simple));
g_return_if_fail (GTK_IS_TREE_MODEL_SIMPLE (simple));
g_return_if_fail (path != NULL);
gtk_signal_emit_by_name (GTK_OBJECT (simple), "iter_deleted", path, iter);
......
......@@ -30,8 +30,8 @@ extern "C" {
#define GTK_TYPE_MODEL_SIMPLE (gtk_tree_model_simple_get_type ())
#define GTK_TREE_MODEL_SIMPLE(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_MODEL_SIMPLE, GtkTreeModelSimple))
#define GTK_TREE_MODEL_SIMPLE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_MODEL_SIMPLE, GtkTreeModelSimpleClass))
#define GTK_IS_MODEL_SIMPLE(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_MODEL_SIMPLE))
#define GTK_IS_MODEL_SIMPLE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), GTK_TYPE_MODEL_SIMPLE))
#define GTK_IS_TREE_MODEL_SIMPLE(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_MODEL_SIMPLE))
#define GTK_IS_TREE_MODEL_SIMPLE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), GTK_TYPE_MODEL_SIMPLE))
typedef struct _GtkTreeModelSimple GtkTreeModelSimple;
typedef struct _GtkTreeModelSimpleClass GtkTreeModelSimpleClass;
......
......@@ -3273,15 +3273,15 @@ gtk_tree_view_columns_autosize (GtkTreeView *tree_view)
* "active" is confusing since it also is a widget state
*/
/**
* gtk_tree_view_set_headers_active:
* gtk_tree_view_set_headers_clickable:
* @tree_view: A #GtkTreeView.
* @active: TRUE if the columns are active.
* @setting: TRUE if the columns are clickable.
*
* Sets the headers active (eg. keyboard navigable) or inactive.
* Allow the column title buttons to be clicked.
**/
void
gtk_tree_view_set_headers_active (GtkTreeView *tree_view,
gboolean active)
gtk_tree_view_set_headers_clickable (GtkTreeView *tree_view,
gboolean setting)
{
GList *list;
......@@ -3290,7 +3290,7 @@ gtk_tree_view_set_headers_active (GtkTreeView *tree_view,
g_return_if_fail (tree_view->priv->model != NULL);
for (list = tree_view->priv->columns; list; list = list->next)
gtk_tree_view_column_set_header_clickable (GTK_TREE_VIEW_COLUMN (list->data), active);
gtk_tree_view_column_set_header_clickable (GTK_TREE_VIEW_COLUMN (list->data), setting);
}
/**
......
......@@ -77,8 +77,8 @@ gboolean gtk_tree_view_get_headers_visible (GtkTreeView *tr
void gtk_tree_view_set_headers_visible (GtkTreeView *tree_view,
gboolean headers_visible);
void gtk_tree_view_columns_autosize (GtkTreeView *tree_view);
void gtk_tree_view_set_headers_active (GtkTreeView *tree_view,
gboolean active);
void gtk_tree_view_set_headers_clickable (GtkTreeView *tree_view,
gboolean active);
gint gtk_tree_view_append_column (GtkTreeView *tree_view,
GtkTreeViewColumn *column);
gint gtk_tree_view_remove_column (GtkTreeView *tree_view,
......
This document is a laundry list of stuff to check if you want to
verify that GtkTreeView and associated objects are working properly.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment