From 4d31b716d5b66300b7d41ff2edb2b0719707193c Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Thu, 16 Feb 2006 18:35:47 +0000 Subject: [PATCH] Merged from HEAD: 2006-02-16 Federico Mena Quintero Merged from HEAD: * gtk/gtkfilechooserdialog.c (gtk_file_chooser_dialog_map): Call ::initial_focus() on the child before calling ::map() on our parent class. This will prevent the shortcuts treeview from highlighting its first row as a result of getting assigned focus by gtk_dialog_map(). --- ChangeLog | 10 ++++++++++ ChangeLog.pre-2-10 | 10 ++++++++++ gtk/gtkfilechooserdialog.c | 4 ++-- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index bb013f242d..5de72b81ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2006-02-16 Federico Mena Quintero + + Merged from HEAD: + + * gtk/gtkfilechooserdialog.c (gtk_file_chooser_dialog_map): Call + ::initial_focus() on the child before calling ::map() on our + parent class. This will prevent the shortcuts treeview from + highlighting its first row as a result of getting assigned focus + by gtk_dialog_map(). + 2006-02-14 Matthias Clasen * gtk/gtkwidget.c (gtk_widget_send_expose): Remove redundant diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index bb013f242d..5de72b81ce 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,13 @@ +2006-02-16 Federico Mena Quintero + + Merged from HEAD: + + * gtk/gtkfilechooserdialog.c (gtk_file_chooser_dialog_map): Call + ::initial_focus() on the child before calling ::map() on our + parent class. This will prevent the shortcuts treeview from + highlighting its first row as a result of getting assigned focus + by gtk_dialog_map(). + 2006-02-14 Matthias Clasen * gtk/gtkwidget.c (gtk_widget_send_expose): Remove redundant diff --git a/gtk/gtkfilechooserdialog.c b/gtk/gtkfilechooserdialog.c index 968795a80a..62c000e7a3 100644 --- a/gtk/gtkfilechooserdialog.c +++ b/gtk/gtkfilechooserdialog.c @@ -499,9 +499,9 @@ gtk_file_chooser_dialog_map (GtkWidget *widget) if (!GTK_WIDGET_MAPPED (priv->widget)) gtk_widget_map (priv->widget); - GTK_WIDGET_CLASS (parent_class)->map (widget); - _gtk_file_chooser_embed_initial_focus (GTK_FILE_CHOOSER_EMBED (priv->widget)); + + GTK_WIDGET_CLASS (parent_class)->map (widget); } /* GtkWidget::unmap handler */