Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

correct behavior in case it is still used with ShowModal

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75296 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2013-11-26 14:28:44 +00:00
parent 27f15965e1
commit 1c73dfa2db
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/generic/aboutdlgg.cpp
View File

@@ -277,16 +277,24 @@ void wxGenericAboutDialog::AddCollapsiblePane(const wxString& title,
void wxGenericAboutDialog::OnCloseWindow(wxCloseEvent& event) void wxGenericAboutDialog::OnCloseWindow(wxCloseEvent& event)
{ {
Destroy(); // safeguards in case the window is still shown using ShowModal
if ( !IsModal() )
Destroy();
event.Skip(); event.Skip();
} }
void wxGenericAboutDialog::OnOK(wxCommandEvent& WXUNUSED(event)) void wxGenericAboutDialog::OnOK(wxCommandEvent& event)
{ {
// By default a modeless dialog would be just hidden, destroy this one // safeguards in case the window is still shown using ShowModal
// instead. if ( !IsModal() )
Destroy(); {
// By default a modeless dialog would be just hidden, destroy this one
// instead.
Destroy();
}
else
event.Skip();
} }
#endif // !wxUSE_MODAL_ABOUT_DIALOG #endif // !wxUSE_MODAL_ABOUT_DIALOG