From 3abfbb435415b095f8165627052f10fb86882c8d Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Sun, 10 Aug 2008 18:24:21 +0000 Subject: [PATCH] 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 --- src/gtk/filedlg.cpp | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp index 70f3c79ff5..82f7d2d232 100644 --- 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(); } -- 2.45.2