Commit efae27a3 authored by Jonathan Blandford's avatar Jonathan Blandford Committed by Jonathan Blandford

Removed (gtk_tree_view_column_set_alignment): xalign = CLAMP (xalign, 0.0,

Tue Sep 25 15:32:44 2001  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtktreeviewcolumn.c
	(gtk_tree_view_column_set_cell_renderer): Removed
	(gtk_tree_view_column_set_alignment): xalign = CLAMP (xalign, 0.0, 1.0);  Fixes 61012.

	* gtk/gtktreestore.c (gtk_tree_store_sort_helper): Fixed #61012
	Patch from Detlef Reichl
parent 5c15d1df
Tue Sep 25 15:32:44 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeviewcolumn.c
(gtk_tree_view_column_set_cell_renderer): Removed
(gtk_tree_view_column_set_alignment): xalign = CLAMP (xalign, 0.0, 1.0); Fixes 61012.
* gtk/gtktreestore.c (gtk_tree_store_sort_helper): Fixed #61012
Patch from Detlef Reichl
2001-09-25 Havoc Pennington <hp@redhat.com>
* tests/testtextbuffer.c (line_separator_tests): Add tests for
......
Tue Sep 25 15:32:44 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeviewcolumn.c
(gtk_tree_view_column_set_cell_renderer): Removed
(gtk_tree_view_column_set_alignment): xalign = CLAMP (xalign, 0.0, 1.0); Fixes 61012.
* gtk/gtktreestore.c (gtk_tree_store_sort_helper): Fixed #61012
Patch from Detlef Reichl
2001-09-25 Havoc Pennington <hp@redhat.com>
* tests/testtextbuffer.c (line_separator_tests): Add tests for
......
Tue Sep 25 15:32:44 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeviewcolumn.c
(gtk_tree_view_column_set_cell_renderer): Removed
(gtk_tree_view_column_set_alignment): xalign = CLAMP (xalign, 0.0, 1.0); Fixes 61012.
* gtk/gtktreestore.c (gtk_tree_store_sort_helper): Fixed #61012
Patch from Detlef Reichl
2001-09-25 Havoc Pennington <hp@redhat.com>
* tests/testtextbuffer.c (line_separator_tests): Add tests for
......
Tue Sep 25 15:32:44 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeviewcolumn.c
(gtk_tree_view_column_set_cell_renderer): Removed
(gtk_tree_view_column_set_alignment): xalign = CLAMP (xalign, 0.0, 1.0); Fixes 61012.
* gtk/gtktreestore.c (gtk_tree_store_sort_helper): Fixed #61012
Patch from Detlef Reichl
2001-09-25 Havoc Pennington <hp@redhat.com>
* tests/testtextbuffer.c (line_separator_tests): Add tests for
......
Tue Sep 25 15:32:44 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeviewcolumn.c
(gtk_tree_view_column_set_cell_renderer): Removed
(gtk_tree_view_column_set_alignment): xalign = CLAMP (xalign, 0.0, 1.0); Fixes 61012.
* gtk/gtktreestore.c (gtk_tree_store_sort_helper): Fixed #61012
Patch from Detlef Reichl
2001-09-25 Havoc Pennington <hp@redhat.com>
* tests/testtextbuffer.c (line_separator_tests): Add tests for
......
Tue Sep 25 15:32:44 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeviewcolumn.c
(gtk_tree_view_column_set_cell_renderer): Removed
(gtk_tree_view_column_set_alignment): xalign = CLAMP (xalign, 0.0, 1.0); Fixes 61012.
* gtk/gtktreestore.c (gtk_tree_store_sort_helper): Fixed #61012
Patch from Detlef Reichl
2001-09-25 Havoc Pennington <hp@redhat.com>
* tests/testtextbuffer.c (line_separator_tests): Add tests for
......
Tue Sep 25 15:32:44 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeviewcolumn.c
(gtk_tree_view_column_set_cell_renderer): Removed
(gtk_tree_view_column_set_alignment): xalign = CLAMP (xalign, 0.0, 1.0); Fixes 61012.
* gtk/gtktreestore.c (gtk_tree_store_sort_helper): Fixed #61012
Patch from Detlef Reichl
2001-09-25 Havoc Pennington <hp@redhat.com>
* tests/testtextbuffer.c (line_separator_tests): Add tests for
......
......@@ -1658,7 +1658,7 @@ gtk_tree_store_sort_helper (GtkTreeStore *tree_store,
GtkTreePath *path;
node = parent->children;
if (node->next == NULL)
if (node == NULL || node->next == NULL)
return;
g_assert (GTK_TREE_STORE_IS_SORTED (tree_store));
......
......@@ -6911,7 +6911,7 @@ gtk_tree_view_insert_column_with_attributes (GtkTreeView *tree_view,
column = gtk_tree_view_column_new ();
gtk_tree_view_column_set_title (column, title);
gtk_tree_view_column_set_cell_renderer (column, cell);
gtk_tree_view_column_pack_start (column, cell, TRUE);
va_start (args, cell);
......@@ -6944,7 +6944,7 @@ gtk_tree_view_insert_column_with_attributes (GtkTreeView *tree_view,
* Convenience function that inserts a new column into the #GtkTreeView
* with the given cell renderer and a #GtkCellDataFunc to set cell renderer
* attributes (normally using data from the model). See also
* gtk_tree_view_column_set_cell_data_func(), gtk_tree_view_column_set_cell_renderer().
* gtk_tree_view_column_set_cell_data_func(), gtk_tree_view_column_pack_start().
*
* Return value: number of columns in the tree view post-insert
**/
......@@ -6964,7 +6964,7 @@ gtk_tree_view_insert_column_with_data_func (GtkTreeView *tree_vie
column = gtk_tree_view_column_new ();
gtk_tree_view_column_set_title (column, title);
gtk_tree_view_column_set_cell_renderer (column, cell);
gtk_tree_view_column_pack_start (column, cell, TRUE);
gtk_tree_view_column_set_cell_data_func (column, cell, func, data, dnotify);
gtk_tree_view_insert_column (tree_view, column, position);
......@@ -7925,6 +7925,37 @@ gtk_tree_view_real_set_cursor (GtkTreeView *tree_view,
gtk_tree_view_queue_draw_node (tree_view, tree, node, NULL);
}
/**
* gtk_tree_view_get_cursor:
* @tree_view: A #GtkTreeView
* @path: A pointer to be filled with the current cursor path, or %NULL
* @focus_column: A pointer to be filled with the current focus column, or %NULL
*
* Fills in @path and @focus_column with the current path and focus column. If
* the cursor isn't currently set, then *path will be %NULL. If no column
* currently has focus, then *focus_column will be %NULL.
**/
void
gtk_tree_view_get_cursor (GtkTreeView *tree_view,
GtkTreePath **path,
GtkTreeViewColumn **focus_column)
{
g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
if (path)
{
if (gtk_tree_row_reference_valid (tree_view->priv->cursor))
*path = gtk_tree_row_reference_get_path (tree_view->priv->cursor);
else
*path = NULL;
}
if (focus_column)
{
*focus_column = tree_view->priv->focus_column;
}
}
/**
* gtk_tree_view_set_cursor:
* @tree_view: A #GtkTreeView
......
......@@ -216,6 +216,9 @@ void gtk_tree_view_set_cursor (GtkTreeView
GtkTreePath *path,
GtkTreeViewColumn *focus_column,
gboolean start_editing);
void gtk_tree_view_get_cursor (GtkTreeView *tree_view,
GtkTreePath **path,
GtkTreeViewColumn **focus_column);
/* Layout information */
......
......@@ -1028,7 +1028,7 @@ gtk_tree_view_column_new (void)
*
* Creates a new #GtkTreeViewColumn with a number of default values. This is
* equivalent to calling @gtk_tree_view_column_set_title,
* @gtk_tree_view_column_set_cell_renderer, and
* @gtk_tree_view_column_pack_start, and
* @gtk_tree_view_column_set_attributes on the newly created #GtkTreeViewColumn.
*
* Return value: A newly created #GtkTreeViewColumn.
......@@ -1044,7 +1044,7 @@ gtk_tree_view_column_new_with_attributes (const gchar *title,
retval = gtk_tree_view_column_new ();
gtk_tree_view_column_set_title (retval, title);
gtk_tree_view_column_set_cell_renderer (retval, cell);
gtk_tree_view_column_pack_start (retval, cell, TRUE);
va_start (args, cell);
gtk_tree_view_column_set_attributesv (retval, cell, args);
......@@ -1053,22 +1053,6 @@ gtk_tree_view_column_new_with_attributes (const gchar *title,
return retval;
}
/**
* gtk_tree_view_column_set_cell_renderer:
* @tree_column: A #GtkTreeViewColumn.
* @cell: The #GtkCellRenderer, or NULL.
*
* Sets the cell renderer of the @tree_column. If there is a cell
* renderer already set, then it is removed. If @cell is NULL, then
* the cell renderer is unset.
**/
void
gtk_tree_view_column_set_cell_renderer (GtkTreeViewColumn *tree_column,
GtkCellRenderer *cell)
{
gtk_tree_view_column_pack_start (tree_column, cell, TRUE);
}
static GtkTreeViewColumnCellInfo *
gtk_tree_view_column_get_cell_info (GtkTreeViewColumn *tree_column,
GtkCellRenderer *cell_renderer)
......@@ -1802,6 +1786,8 @@ gtk_tree_view_column_set_alignment (GtkTreeViewColumn *tree_column,
{
g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
xalign = CLAMP (xalign, 0.0, 1.0);
if (tree_column->xalign == xalign)
return;
......
......@@ -110,8 +110,6 @@ GtkTreeViewColumn *gtk_tree_view_column_new (void);
GtkTreeViewColumn *gtk_tree_view_column_new_with_attributes (const gchar *title,
GtkCellRenderer *cell,
...);
void gtk_tree_view_column_set_cell_renderer (GtkTreeViewColumn *tree_column,
GtkCellRenderer *cell);
void gtk_tree_view_column_pack_start (GtkTreeViewColumn *tree_column,
GtkCellRenderer *cell,
gboolean expand);
......
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