Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-03-11 08:56:03 +01:00
Code Issues Releases Wiki Activity

Stack-allocate where possible! ...

Browse Source 
... Removed many unnecessary naked news and deletes.
This commit is contained in:
Paul Licameli
2016-01-31 20:39:24 -05:00
parent be1d9b7dd5
commit dbaa811577
43 changed files with 785 additions and 839 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/widgets/Meter.cpp
View File

@@ -679,18 +679,18 @@ void Meter::OnMouse(wxMouseEvent &evt)
if (evt.RightDown() ||
(evt.ButtonDown() && mIconRect.Contains(evt.m_x, evt.m_y)))
{
wxMenu *menu = new wxMenu();
wxMenu menu;
// Note: these should be kept in the same order as the enum
if (mIsInput) {
wxMenuItem *mi;
if (mMonitoring)
mi = menu->Append(OnMonitorID, _("Stop Monitoring"));
mi = menu.Append(OnMonitorID, _("Stop Monitoring"));
else
mi = menu->Append(OnMonitorID, _("Start Monitoring"));
mi = menu.Append(OnMonitorID, _("Start Monitoring"));
mi->Enable(!mActive || mMonitoring);
}
menu->Append(OnPreferencesID, _("Preferences..."));
menu.Append(OnPreferencesID, _("Preferences..."));
if (evt.RightDown()) {
ShowMenu(evt.GetPosition());
@@ -698,8 +698,6 @@ void Meter::OnMouse(wxMouseEvent &evt)
else {
ShowMenu(wxPoint(mIconRect.x + 1, mIconRect.y + mIconRect.height + 1));
}
delete menu;
}
else if (evt.LeftDown()) {
if (mIsInput) {
@@ -1863,22 +1861,22 @@ void Meter::RestoreState(void *state)
void Meter::ShowMenu(const wxPoint & pos)
{
wxMenu *menu = new wxMenu();
wxMenu menu;
// Note: these should be kept in the same order as the enum
if (mIsInput) {
wxMenuItem *mi;
if (mMonitoring)
mi = menu->Append(OnMonitorID, _("Stop Monitoring"));
mi = menu.Append(OnMonitorID, _("Stop Monitoring"));
else
mi = menu->Append(OnMonitorID, _("Start Monitoring"));
mi = menu.Append(OnMonitorID, _("Start Monitoring"));
mi->Enable(!mActive || mMonitoring);
}
menu->Append(OnPreferencesID, _("Preferences..."));
menu.Append(OnPreferencesID, _("Preferences..."));
mAccSilent = true; // temporarily make screen readers say (close to) nothing on focus events
PopupMenu(menu, pos);
PopupMenu(&menu, pos);
/* if stop/start monitoring was chosen in the menu, then by this point
OnMonitoring has been called and variables which affect the accessibility
@@ -1891,8 +1889,6 @@ void Meter::ShowMenu(const wxPoint & pos)
wxOBJID_CLIENT,
wxACC_SELF);
#endif
delete menu;
}
void Meter::OnMonitor(wxCommandEvent & WXUNUSED(event))