From fd6c5101a52748bb670f58c08900ec553312482a Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Sun, 10 Aug 2008 00:19:56 +0000 Subject: [PATCH] fix previous commit to respect minimum width git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55041 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/filedlg.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp index 09f353fb7f..70f3c79ff5 100644 --- a/src/gtk/filedlg.cpp +++ b/src/gtk/filedlg.cpp @@ -136,10 +136,10 @@ static void gtk_filedialog_update_preview_callback(GtkFileChooser *chooser, //----------------------------------------------------------------------------- extern "C" { -static void extra_widget_size_request(GtkWidget*, GtkRequisition* req, void*) +static void extra_widget_size_request(GtkWidget*, GtkRequisition* req, wxWindow* win) { // allow dialog to be resized smaller horizontally - req->width = 1; + req->width = win->GetMinWidth(); } } @@ -148,7 +148,6 @@ static void wxInsertChildInFileDialog(wxWindow* WXUNUSED(parent), { } - //----------------------------------------------------------------------------- // wxFileDialog //----------------------------------------------------------------------------- @@ -311,7 +310,7 @@ int wxFileDialog::ShowModal() gtk_widget_show(control); g_signal_connect_after(control, "size_request", - G_CALLBACK(extra_widget_size_request), NULL); + G_CALLBACK(extra_widget_size_request), m_extraControl); gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(m_widget), control); } -- 2.47.2