fix previous commit to respect minimum width

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55041 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2008-08-10 00:19:56 +00:00
parent f3fda1aa01
commit fd6c5101a5

View File

@@ -136,10 +136,10 @@ static void gtk_filedialog_update_preview_callback(GtkFileChooser *chooser,
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
extern "C" { 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 // 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 // wxFileDialog
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -311,7 +310,7 @@ int wxFileDialog::ShowModal()
gtk_widget_show(control); gtk_widget_show(control);
g_signal_connect_after(control, "size_request", 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); gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(m_widget), control);
} }