From 5bc61e5d0bc638cc72af9f583a9958d75c946407 Mon Sep 17 00:00:00 2001 From: Leland Lucius Date: Tue, 25 Aug 2015 21:19:53 -0500 Subject: [PATCH] Fix option truncation and possible crash --- lib-src/FileDialog/mac/FileDialogPrivate.mm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lib-src/FileDialog/mac/FileDialogPrivate.mm b/lib-src/FileDialog/mac/FileDialogPrivate.mm index c5c080f5d..85523c07e 100644 --- a/lib-src/FileDialog/mac/FileDialogPrivate.mm +++ b/lib-src/FileDialog/mac/FileDialogPrivate.mm @@ -1,4 +1,4 @@ -// +/// // Copied from wxWidgets 3.0.2 and modified to support additional features // ///////////////////////////////////////////////////////////////////////////// @@ -509,20 +509,17 @@ void FileDialog::SetupExtraControls(WXWindow nativeWindow) m_filterPanel->SetSizer( verticalSizer ); m_filterPanel->Layout(); - NSSize ss = [[accView superview] frame].size; wxSize ws = m_filterPanel->GetBestSize(); - ws.SetWidth( wxMax( (wxCoord) ss.width, ws.GetWidth() ) ); - m_filterPanel->SetSize(ws); + m_filterPanel->SetMinSize(ws); } if ( accView != nil ) { [accView removeFromSuperview]; + [accView setAutoresizingMask:NSViewWidthSizable]; [panel setAccessoryView:accView]; - - [accView setAutoresizingMask:NSViewWidthSizable]; } } @@ -728,6 +725,8 @@ void FileDialog::ModalFinishedCallback(void* panel, int returnCode) if ( m_delegate ) { + [[NSNotificationCenter defaultCenter] removeObserver:m_delegate]; + [m_delegate release]; m_delegate = nil; }