fix releasing mouse capture before showing modal dialog, see #16647

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78147 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2014-11-14 18:56:37 +00:00
parent 2f3969724b
commit 00cc0233f6
4 changed files with 24 additions and 13 deletions

View File

@@ -277,12 +277,6 @@ int wxMessageDialog::ShowModal()
{
WX_HOOK_MODAL_DIALOG();
// break the mouse capture as it would interfere with modal dialog (see
// wxDialog::ShowModal)
wxWindow * const win = wxWindow::GetCapture();
if ( win )
win->GTKReleaseMouseAndNotify();
if ( !m_widget )
{
GTKCreateMsgDialog();
@@ -290,6 +284,10 @@ int wxMessageDialog::ShowModal()
wxT("failed to create GtkMessageDialog") );
}
// break the mouse capture as it would interfere with modal dialog (see
// wxDialog::ShowModal)
GTKReleaseMouseAndNotify();
// This should be necessary, but otherwise the
// parent TLW will disappear..
if (m_parent)