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

fixed assertion failure if Ok or Cancel button is clicked in a modeless dialog (bug 973873)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27950 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-06-22 23:20:27 +00:00
parent b7f5f3cc75
commit 12b58624e9
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/msw/dialog.h
View File

@@ -113,6 +113,9 @@ protected:
// common part of all ctors // common part of all ctors
void Init(); void Init();
// end either modal or modeless dialog
void EndDialog(int rc);
private: private:
wxWindow* m_oldFocus; wxWindow* m_oldFocus;
bool m_endModalCalled; // allow for closing within InitDialog bool m_endModalCalled; // allow for closing within InitDialog

14
src/msw/dialog.cpp
View File

@@ -368,7 +368,15 @@ void wxDialog::EndModal(int retCode)
m_endModalCalled = true; m_endModalCalled = true;
SetReturnCode(retCode); SetReturnCode(retCode);
Show(false); Hide();
}
void wxDialog::EndDialog(int rc)
{
if ( IsModal() )
EndModal(rc);
else
Hide();
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -380,7 +388,7 @@ void wxDialog::OnOK(wxCommandEvent& WXUNUSED(event))
{ {
if ( Validate() && TransferDataFromWindow() ) if ( Validate() && TransferDataFromWindow() )
{ {
EndModal(wxID_OK); EndDialog(wxID_OK);
} }
} }
@@ -394,7 +402,7 @@ void wxDialog::OnApply(wxCommandEvent& WXUNUSED(event))
void wxDialog::OnCancel(wxCommandEvent& WXUNUSED(event)) void wxDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
{ {
EndModal(wxID_CANCEL); EndDialog(wxID_CANCEL);
} }
void wxDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) void wxDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))