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

1. more warnings fixed

Browse Source 
2. fixed wxProgressDialog to work as wxDialog now does


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-10-07 21:34:35 +00:00
parent b0a6bb75bc
commit ef8698d677
3 changed files with 35 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/generic/progdlgg.cpp
View File

@@ -65,8 +65,11 @@ static void SetTimeLabel(unsigned long val, wxStaticText *label);
// ----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(wxProgressDialog, wxDialog)
EVT_BUTTON(wxID_CANCEL, wxProgressDialog::OnCancel)
EVT_CLOSE(wxProgressDialog::OnClose)
EVT_BUTTON(wxID_CANCEL, wxProgressDialog::OnCancel)
EVT_SHOW(wxProgressDialog::OnShow)
EVT_CLOSE(wxProgressDialog::OnClose)
END_EVENT_TABLE()
IMPLEMENT_CLASS(wxProgressDialog, wxDialog)
@@ -377,15 +380,32 @@ 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
// ----------------------------------------------------------------------------
wxProgressDialog::~wxProgressDialog()
{
// normally this should have been already done, but just in case
ReenableOtherWindows();
}
void wxProgressDialog::ReenableOtherWindows()
{
if ( GetWindowStyle() & wxPD_APP_MODAL )
{
delete m_winDisabler;
m_winDisabler = (wxWindowDisabler *)NULL;
}
else
{