Fix for bug 180, 'Close' now handled properly.

This commit is contained in:
martynshaw99 2010-07-20 22:20:45 +00:00
parent b6442aed73
commit fd268badd5
2 changed files with 8 additions and 0 deletions

View File

@ -989,6 +989,7 @@ static const unsigned char beep[] =
BEGIN_EVENT_TABLE(ProgressDialog, wxDialog)
EVT_BUTTON(wxID_CANCEL, ProgressDialog::OnCancel)
EVT_BUTTON(wxID_OK, ProgressDialog::OnStop)
EVT_CLOSE(ProgressDialog::OnCloseWindow)
END_EVENT_TABLE()
//
@ -1352,6 +1353,12 @@ ProgressDialog::OnStop(wxCommandEvent & e)
mStop = true;
}
void
ProgressDialog::OnCloseWindow(wxCloseEvent & WXUNUSED(event))
{
mCancel = true;
}
void
ProgressDialog::Beep()
{

View File

@ -67,6 +67,7 @@ class AUDACITY_DLL_API ProgressDialog:public wxDialog
private:
void OnCancel(wxCommandEvent & e);
void OnStop(wxCommandEvent & e);
void OnCloseWindow(wxCloseEvent & e);
void Beep();
protected: