Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-21 16:37:12 +01:00
Code Issues Releases Wiki Activity

Define and use ShuttleGui::ConnectRoot...

Browse Source 
... And corrected improper connections in HistoryWindow and ContrastDialog,
improper because they got called with the wrong this pointer, to
the control instead of the dialog.  But that was harmless anyway because the
handlers did not use this.
This commit is contained in:
Paul Licameli
2018-01-31 11:31:55 -05:00
parent d98e41aad1
commit 64a96e6f01
13 changed files with 115 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/HistoryWindow.cpp
View File

@@ -96,16 +96,14 @@ HistoryWindow::HistoryWindow(AudacityProject *parent, UndoManager *manager):
S.StartMultiColumn(3, wxCENTRE);
{
mTotal = S.Id(ID_TOTAL).AddTextBox(_("&Total space used"), wxT("0"), 10);
mTotal->Bind(wxEVT_KEY_DOWN,
// ignore it
[](wxEvent&){});
mTotal = S.Id(ID_TOTAL)
.ConnectRoot(wxEVT_KEY_DOWN, &HistoryWindow::OnChar)
.AddTextBox(_("&Total space used"), wxT("0"), 10);
S.AddVariableText( {} )->Hide();
mAvail = S.Id(ID_AVAIL).AddTextBox(_("&Undo levels available"), wxT("0"), 10);
mAvail->Bind(wxEVT_KEY_DOWN,
// ignore it
[](wxEvent&){});
mAvail = S.Id(ID_AVAIL)
.ConnectRoot(wxEVT_KEY_DOWN, &HistoryWindow::OnChar)
.AddTextBox(_("&Undo levels available"), wxT("0"), 10);
S.AddVariableText( {} )->Hide();
S.AddPrompt(_("&Levels to discard"));
@@ -122,10 +120,9 @@ HistoryWindow::HistoryWindow(AudacityProject *parent, UndoManager *manager):
/* i18n-hint: (verb)*/
mDiscard = S.Id(ID_DISCARD).AddButton(_("&Discard"));
mClipboard = S.AddTextBox(_("Clipboard space used"), wxT("0"), 10);
mClipboard->Bind(wxEVT_KEY_DOWN,
// ignore it
[](wxEvent&){});
mClipboard = S
.ConnectRoot(wxEVT_KEY_DOWN, &HistoryWindow::OnChar)
.AddTextBox(_("Clipboard space used"), wxT("0"), 10);
S.Id(ID_DISCARD_CLIPBOARD).AddButton(_("Discard"));
}
S.EndMultiColumn();
@@ -164,6 +161,11 @@ HistoryWindow::HistoryWindow(AudacityProject *parent, UndoManager *manager):
parent->Bind(EVT_UNDO_RESET, &HistoryWindow::UpdateDisplay, this);
}
void HistoryWindow::OnChar( wxEvent& )
{
// ignore it
}
void HistoryWindow::OnAudioIO(wxCommandEvent& evt)
{
evt.Skip();