Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-16 08:09:32 +02:00
Code Issues Releases Wiki Activity

BatchProcessDialog Close command working again.

Browse Source 
Sending a wxCloseEvent doesn't close a Modal dialog (unless we hide it first).
This commit is contained in:
James Crook 2015-10-10 15:27:35 +01:00
parent aee4a33d6b
commit 6d95e68dad
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/BatchProcessDialog.cpp
View File

@ -197,6 +197,7 @@ void BatchProcessDialog::OnApplyToProject(wxCommandEvent & WXUNUSED(event))
// Under Linux an EndModal() here is the cause of Bug #1221. // Under Linux an EndModal() here is the cause of Bug #1221.
// But sending a close message instead is OK. // But sending a close message instead is OK.
wxCloseEvent Evt; wxCloseEvent Evt;
Evt.SetId( wxID_OK );
Evt.SetEventObject( this); Evt.SetEventObject( this);
ProcessWindowEvent( Evt ); ProcessWindowEvent( Evt );
pWnd->SetFocus(); pWnd->SetFocus();
@ -363,6 +364,7 @@ void BatchProcessDialog::OnApplyToFiles(wxCommandEvent & WXUNUSED(event))
// Under Linux an EndModal() here is the cause of Bug #1221. // Under Linux an EndModal() here is the cause of Bug #1221.
// But sending a close message instead is OK. // But sending a close message instead is OK.
wxCloseEvent Evt; wxCloseEvent Evt;
Evt.SetId( wxID_OK );
Evt.SetEventObject( this); Evt.SetEventObject( this);
ProcessWindowEvent( Evt ); ProcessWindowEvent( Evt );
pWnd->SetFocus(); pWnd->SetFocus();
@ -370,12 +372,17 @@ void BatchProcessDialog::OnApplyToFiles(wxCommandEvent & WXUNUSED(event))
void BatchProcessDialog::OnCancel(wxCommandEvent & WXUNUSED(event)) void BatchProcessDialog::OnCancel(wxCommandEvent & WXUNUSED(event))
{ {
#if 1
Hide();
// Under Linux an EndModal() here is the cause of Bug #1221. // Under Linux an EndModal() here is the cause of Bug #1221.
// But sending a close message instead is OK. // But sending a close message instead is OK.
wxCloseEvent Evt; wxCloseEvent Evt;
Evt.SetId( wxID_CANCEL );
Evt.SetEventObject( this); Evt.SetEventObject( this);
ProcessWindowEvent( Evt ); ProcessWindowEvent( Evt );
//EndModal(wxID_CANCEL); #else
EndModal(wxID_CANCEL);
#endif
} }
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////