AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

don't reenable the disabled windows in OnShow(), it is unnecessary and the code there was buggy

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2002-04-03 12:54:09 +00:00
parent 8372d79dc2
commit 7086987f11
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/generic/progdlgg.h
View File

@ -70,9 +70,6 @@ protected:
// callback to disable "hard" window closing // callback to disable "hard" window closing
void OnClose(wxCloseEvent& event); 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 // must be called to reenable the other windows temporarily disabled while
// the dialog was shown // the dialog was shown
void ReenableOtherWindows(); void ReenableOtherWindows();

12
src/generic/progdlgg.cpp
View File

@ -67,8 +67,6 @@ static void SetTimeLabel(unsigned long val, wxStaticText *label);
BEGIN_EVENT_TABLE(wxProgressDialog, wxDialog) BEGIN_EVENT_TABLE(wxProgressDialog, wxDialog)
EVT_BUTTON(wxID_CANCEL, wxProgressDialog::OnCancel) EVT_BUTTON(wxID_CANCEL, wxProgressDialog::OnCancel)
EVT_SHOW(wxProgressDialog::OnShow)
EVT_CLOSE(wxProgressDialog::OnClose) EVT_CLOSE(wxProgressDialog::OnClose)
END_EVENT_TABLE() 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 // destruction
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------