set extra widget from child inserter, so that correct style is set early enough

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55046 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp
index 70f3c79ff530fe77dc15a8c0985e37281220a839..82f7d2d23292692079c6cfeff3c6bb82262d98be 100644 (file)
--- a/src/gtk/filedlg.cpp
+++ b/src/gtk/filedlg.cpp
@@ -143,9 +143,12 @@ static void extra_widget_size_request(GtkWidget*, GtkRequisition* req, wxWindow*
 }
 }
 
-static void wxInsertChildInFileDialog(wxWindow* WXUNUSED(parent),
-                                      wxWindow* WXUNUSED(child))
+static void wxInsertChildInFileDialog(wxWindow* parent, wxWindow* child)
 {
+    g_signal_connect_after(child->m_widget, "size_request",
+        G_CALLBACK(extra_widget_size_request), child);
+    gtk_file_chooser_set_extra_widget(
+        GTK_FILE_CHOOSER(parent->m_widget), child->m_widget);
 }
 
 //-----------------------------------------------------------------------------
@@ -302,17 +305,7 @@ void wxFileDialog::OnFakeOk(wxCommandEvent& WXUNUSED(event))
 
 int wxFileDialog::ShowModal()
 {
-    if (CreateExtraControl())
-    {
-        GtkWidget *control = m_extraControl->m_widget;
-
-        wxASSERT(control->parent == NULL);
-
-        gtk_widget_show(control);
-        g_signal_connect_after(control, "size_request",
-            G_CALLBACK(extra_widget_size_request), m_extraControl);
-        gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(m_widget), control);
-    }
+    CreateExtraControl();
 
     return wxDialog::ShowModal();
 }