Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55046 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2008-08-10 18:24:21 +00:00
parent c2cbae6bb8
commit 3abfbb4354
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/gtk/filedlg.cpp
View File

@@ -143,9 +143,12 @@ static void extra_widget_size_request(GtkWidget*, GtkRequisition* req, wxWindow*
} }
} }
static void wxInsertChildInFileDialog(wxWindow* WXUNUSED(parent), static void wxInsertChildInFileDialog(wxWindow* parent, wxWindow* child)
wxWindow* WXUNUSED(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() int wxFileDialog::ShowModal()
{ {
if (CreateExtraControl()) 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);
}
return wxDialog::ShowModal(); return wxDialog::ShowModal();
} }