Fix some errors in the handling of drop columns. (#143355, John Finlay)

2005-05-18  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktreeview.c (gtk_tree_view_get_drop_column)
	(gtk_tree_view_set_column_drag_info): Fix some errors in the
	handling of drop columns.  (#143355, John Finlay)
This commit is contained in:
Matthias Clasen 2005-05-18 16:32:38 +00:00 committed by Matthias Clasen
parent b1f056a802
commit 763452a14f
4 changed files with 15 additions and 3 deletions

View File

@ -1,5 +1,9 @@
2005-05-18 Matthias Clasen <mclasen@redhat.com> 2005-05-18 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_get_drop_column)
(gtk_tree_view_set_column_drag_info): Fix some errors in the
handling of drop columns. (#143355, John Finlay)
* gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_init): * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_init):
Remove the no longer needed workaround. Remove the no longer needed workaround.

View File

@ -1,5 +1,9 @@
2005-05-18 Matthias Clasen <mclasen@redhat.com> 2005-05-18 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_get_drop_column)
(gtk_tree_view_set_column_drag_info): Fix some errors in the
handling of drop columns. (#143355, John Finlay)
* gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_init): * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_init):
Remove the no longer needed workaround. Remove the no longer needed workaround.

View File

@ -1,5 +1,9 @@
2005-05-18 Matthias Clasen <mclasen@redhat.com> 2005-05-18 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_get_drop_column)
(gtk_tree_view_set_column_drag_info): Fix some errors in the
handling of drop columns. (#143355, John Finlay)
* gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_init): * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_init):
Remove the no longer needed workaround. Remove the no longer needed workaround.

View File

@ -4018,7 +4018,7 @@ gtk_tree_view_get_drop_column (GtkTreeView *tree_view,
continue; continue;
} }
return cur_column; return left_column;
} }
if (!tree_view->priv->column_drop_func) if (!tree_view->priv->column_drop_func)
@ -4069,7 +4069,7 @@ gtk_tree_view_get_drop_column (GtkTreeView *tree_view,
continue; continue;
} }
return cur_column; return left_column;
} }
if (!tree_view->priv->column_drop_func) if (!tree_view->priv->column_drop_func)
@ -8054,7 +8054,7 @@ gtk_tree_view_set_column_drag_info (GtkTreeView *tree_view,
/* Add the last one */ /* Add the last one */
if (tree_view->priv->column_drop_func == NULL || if (tree_view->priv->column_drop_func == NULL ||
((left_column != column) && ((left_column != column) &&
(* tree_view->priv->column_drop_func) (tree_view, column, left_column, cur_column, tree_view->priv->column_drop_func_data))) (* tree_view->priv->column_drop_func) (tree_view, column, left_column, NULL, tree_view->priv->column_drop_func_data)))
{ {
reorder = g_new (GtkTreeViewColumnReorder, 1); reorder = g_new (GtkTreeViewColumnReorder, 1);
reorder->left_column = left_column; reorder->left_column = left_column;