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:
@@ -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);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user