From d8d64901c7348e2b092753f5b62b4484fb7a2864 Mon Sep 17 00:00:00 2001 From: Jonathan Blandford Date: Tue, 13 Apr 2004 16:27:03 +0000 Subject: [PATCH] remove unused variable. (gtk_tree_view_button_press): If we activated the Tue Apr 13 12:24:49 2004 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_destroy): remove unused variable. (gtk_tree_view_button_press): If we activated the row we don't want to grab focus back, as moving focus to another widget is pretty common, #138458 --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-4 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ gtk/gtktreeview.c | 13 +++++++++---- 6 files changed, 49 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1401e17fb..fe92f56f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Tue Apr 13 12:24:49 2004 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_destroy): remove unused + variable. + (gtk_tree_view_button_press): If we activated the row we don't + want to grab focus back, as moving focus to another widget is + pretty common, #138458 + 2004-04-12 Federico Mena Quintero * gtk/gtkfilechooser.c (gtk_file_chooser_class_init): Added diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1401e17fb..fe92f56f7 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +Tue Apr 13 12:24:49 2004 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_destroy): remove unused + variable. + (gtk_tree_view_button_press): If we activated the row we don't + want to grab focus back, as moving focus to another widget is + pretty common, #138458 + 2004-04-12 Federico Mena Quintero * gtk/gtkfilechooser.c (gtk_file_chooser_class_init): Added diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 1401e17fb..fe92f56f7 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +Tue Apr 13 12:24:49 2004 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_destroy): remove unused + variable. + (gtk_tree_view_button_press): If we activated the row we don't + want to grab focus back, as moving focus to another widget is + pretty common, #138458 + 2004-04-12 Federico Mena Quintero * gtk/gtkfilechooser.c (gtk_file_chooser_class_init): Added diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 1401e17fb..fe92f56f7 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +Tue Apr 13 12:24:49 2004 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_destroy): remove unused + variable. + (gtk_tree_view_button_press): If we activated the row we don't + want to grab focus back, as moving focus to another widget is + pretty common, #138458 + 2004-04-12 Federico Mena Quintero * gtk/gtkfilechooser.c (gtk_file_chooser_class_init): Added diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 1401e17fb..fe92f56f7 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +Tue Apr 13 12:24:49 2004 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_destroy): remove unused + variable. + (gtk_tree_view_button_press): If we activated the row we don't + want to grab focus back, as moving focus to another widget is + pretty common, #138458 + 2004-04-12 Federico Mena Quintero * gtk/gtkfilechooser.c (gtk_file_chooser_class_init): Added diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 65bc59e7e..163b420b4 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -1208,7 +1208,6 @@ static void gtk_tree_view_destroy (GtkObject *object) { GtkTreeView *tree_view = GTK_TREE_VIEW (object); - GtkWidget *search_dialog; GList *list; gtk_tree_view_stop_editing (tree_view, TRUE); @@ -2338,9 +2337,15 @@ gtk_tree_view_button_press (GtkWidget *widget, gtk_tree_path_free (path); - if (!GTK_WIDGET_HAS_FOCUS (widget)) - gtk_widget_grab_focus (widget); - GTK_TREE_VIEW_UNSET_FLAG (tree_view, GTK_TREE_VIEW_DRAW_KEYFOCUS); + /* If we activated the row we don't want to grab focus back, as moving + * focus to another widget is pretty common. + */ + if (!row_double_click) + { + if (!GTK_WIDGET_HAS_FOCUS (widget)) + gtk_widget_grab_focus (widget); + GTK_TREE_VIEW_UNSET_FLAG (tree_view, GTK_TREE_VIEW_DRAW_KEYFOCUS); + } return TRUE; } -- 2.43.2