callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make path arg const, #75653

Browse Source 
Sun Mar 24 10:32:38 2002  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtktreemodel.c (gtk_tree_path_copy): Make path arg const, #75653

	* gtk/gtkfontsel.c (gtk_font_selection_show_available_styles): fix
	a warning

	* gtk/gtktreeview.c (gtk_tree_view_button_press): remove the grab
	when we emit row_activated so that listeners of this signal can
	grab the mouse, #75629
This commit is contained in:
Jonathan Blandford
2002-03-25 04:10:49 +00:00
committed by Jonathan Blandford
parent 2a8fc72b0d
commit 7cc14762b9
10 changed files with 85 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
gtk/gtktreeview.c
View File

@ -1709,6 +1709,7 @@ gtk_tree_view_button_press (GtkWidget *widget,
gint pre_val, aft_val;
GtkTreeViewColumn *column = NULL;
gint column_handled_click = FALSE;
gboolean emit_row_activated = FALSE;
if (!GTK_WIDGET_HAS_FOCUS (widget))
gtk_widget_grab_focus (widget);
@ -1877,14 +1878,9 @@ gtk_tree_view_button_press (GtkWidget *widget,
if (event->button == 1 && event->type == GDK_2BUTTON_PRESS &&
tree_view->priv->last_single_clicked)
{
GtkTreePath *lsc = gtk_tree_row_reference_get_path (tree_view->priv->last_single_clicked);
GtkTreePath *lsc;
if (lsc)
{
if (!gtk_tree_path_compare (lsc, path))
gtk_tree_view_row_activated (tree_view, path, column);
gtk_tree_path_free (lsc);
}
lsc = gtk_tree_row_reference_get_path (tree_view->priv->last_single_clicked);
if (tree_view->priv->last_single_clicked)
gtk_tree_row_reference_free (tree_view->priv->last_single_clicked);
@ -1892,6 +1888,13 @@ gtk_tree_view_button_press (GtkWidget *widget,
gtk_tree_row_reference_free (tree_view->priv->last_single_clicked_2);
tree_view->priv->last_single_clicked = NULL;
tree_view->priv->last_single_clicked_2 = NULL;
if (lsc)
{
if (!gtk_tree_path_compare (lsc, path))
emit_row_activated = TRUE;
gtk_tree_path_free (lsc);
}
}
else if (event->button == 1 && event->type == GDK_BUTTON_PRESS)
{
@ -1903,6 +1906,12 @@ gtk_tree_view_button_press (GtkWidget *widget,
GTK_TREE_VIEW_UNSET_FLAG (tree_view, GTK_TREE_VIEW_DRAW_KEYFOCUS);
gtk_tree_path_free (path);
if (emit_row_activated)
{
gtk_grab_remove (widget);
gtk_tree_view_row_activated (tree_view, path, column);
}
return TRUE;
}