Call ::initial_focus() on the child before calling ::map() on our parent

2006-02-16  Federico Mena Quintero  <federico@novell.com>

	* 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().

diff --git a/ChangeLog b/ChangeLog
index d4809629dbaeaa04a8c2913ee4f331fc8e408a05..33d2bd0b8e8ad632f3a0e2d3b75cf9238c0f9383 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-02-16  Federico Mena Quintero  <federico@novell.com>
+
+       * 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  <mclasen@redhat.com>
 
        * gtk/gtkwidget.c (gtk_widget_send_expose): Remove redundant

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d4809629dbaeaa04a8c2913ee4f331fc8e408a05..33d2bd0b8e8ad632f3a0e2d3b75cf9238c0f9383 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2006-02-16  Federico Mena Quintero  <federico@novell.com>
+
+       * 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  <mclasen@redhat.com>
 
        * gtk/gtkwidget.c (gtk_widget_send_expose): Remove redundant

diff --git a/gtk/gtkfilechooserdialog.c b/gtk/gtkfilechooserdialog.c
index db1e5744105d59d9d5de888622a7b0e0edb60b9e..32a9fa9ce3bb9770ae1e57855008f8971a4b1eff 100644 (file)
--- a/gtk/gtkfilechooserdialog.c
+++ b/gtk/gtkfilechooserdialog.c
@@ -488,9 +488,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 */