From 7086987f11055d44165f0c448209df80bdc5bc11 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 3 Apr 2002 12:54:09 +0000 Subject: [PATCH] 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 --- include/wx/generic/progdlgg.h | 3 --- src/generic/progdlgg.cpp | 12 ------------ 2 files changed, 15 deletions(-) diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h index 872bba1fe0..57bcf51d4a 100644 --- a/include/wx/generic/progdlgg.h +++ b/include/wx/generic/progdlgg.h @@ -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(); diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp index ee2f457eff..15fb92990f 100644 --- a/src/generic/progdlgg.cpp +++ b/src/generic/progdlgg.cpp @@ -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 // ---------------------------------------------------------------------------- -- 2.45.2