don't reenable the disabled windows in OnShow(), it is unnecessary and the code there was buggy
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
8372d79dc2
commit
7086987f11
@ -70,9 +70,6 @@ protected:
|
||||
// callback to disable "hard" window closing
|
||||
void OnClose(wxCloseEvent& event);
|
||||
|
||||
// callback to detect when the dialog is closed
|
||||
void OnShow(wxShowEvent& event);
|
||||
|
||||
// must be called to reenable the other windows temporarily disabled while
|
||||
// the dialog was shown
|
||||
void ReenableOtherWindows();
|
||||
|
@ -67,8 +67,6 @@ static void SetTimeLabel(unsigned long val, wxStaticText *label);
|
||||
BEGIN_EVENT_TABLE(wxProgressDialog, wxDialog)
|
||||
EVT_BUTTON(wxID_CANCEL, wxProgressDialog::OnCancel)
|
||||
|
||||
EVT_SHOW(wxProgressDialog::OnShow)
|
||||
|
||||
EVT_CLOSE(wxProgressDialog::OnClose)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
@ -438,16 +436,6 @@ void wxProgressDialog::OnClose(wxCloseEvent& event)
|
||||
}
|
||||
}
|
||||
|
||||
void wxProgressDialog::OnShow(wxShowEvent& event)
|
||||
{
|
||||
// if the dialog is being hidden, it was closed, so reenable other windows
|
||||
// now
|
||||
if ( event.GetShow() )
|
||||
{
|
||||
ReenableOtherWindows();
|
||||
}
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// destruction
|
||||
// ----------------------------------------------------------------------------
|
||||
|
Loading…
Reference in New Issue
Block a user