From 0377a24f90445f43a0903e85ee55eb12b6c020ff Mon Sep 17 00:00:00 2001 From: Steve Daulton Date: Fri, 27 May 2016 10:45:01 +0100 Subject: [PATCH] Comment out unused TrackPanel::BuildVRulerMenuItems function The function builds pop up menus that are never displayed and creates runtime debug warnings. It is left over from PRL's experiment in 2.1.2 with a context menu for the vertical ruler. --- src/TrackPanel.cpp | 5 +++++ src/TrackPanel.h | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp index 86a384d44..1520c4087 100644 --- a/src/TrackPanel.cpp +++ b/src/TrackPanel.cpp @@ -659,6 +659,7 @@ void TrackPanel::BuildMenus(void) mTimeTrackMenu->Append(OnSetTimeTrackRangeID, _("&Range...")); mTimeTrackMenu->AppendCheckItem(OnTimeTrackLogIntID, _("Logarithmic &Interpolation")); +/* mRulerWaveformMenu = new wxMenu(); BuildVRulerMenuItems (mRulerWaveformMenu, OnFirstWaveformScaleID, @@ -668,6 +669,7 @@ void TrackPanel::BuildMenus(void) BuildVRulerMenuItems (mRulerSpectrumMenu, OnFirstSpectrumScaleID, SpectrogramSettings::GetScaleNames()); +*/ } void TrackPanel::BuildCommonDropMenuItems(wxMenu * menu) @@ -686,6 +688,8 @@ void TrackPanel::BuildCommonDropMenuItems(wxMenu * menu) } +/* +// left over from PRL's vertical ruler context menu experiment in 2.1.2 // static void TrackPanel::BuildVRulerMenuItems (wxMenu * menu, int firstId, const wxArrayString &names) @@ -698,6 +702,7 @@ void TrackPanel::BuildVRulerMenuItems menu->Append(OnZoomOutVerticalID, _("Zoom Out\tShift-Left-Click")); menu->Append(OnZoomFitVerticalID, _("Zoom to Fit\tShift-Right-Click")); } +*/ void TrackPanel::DeleteMenus(void) { diff --git a/src/TrackPanel.h b/src/TrackPanel.h index 125526903..23b0dd7d2 100644 --- a/src/TrackPanel.h +++ b/src/TrackPanel.h @@ -242,7 +242,10 @@ class AUDACITY_DLL_API TrackPanel final : public OverlayPanel { * @param menu the menu to add the commands to. */ virtual void BuildCommonDropMenuItems(wxMenu * menu); - static void BuildVRulerMenuItems(wxMenu * menu, int firstId, const wxArrayString &names); + + // left over from PRL's vertical ruler context menu experiment in 2.1.2 + // static void BuildVRulerMenuItems(wxMenu * menu, int firstId, const wxArrayString &names); + virtual bool IsAudioActive(); virtual bool IsUnsafe(); virtual bool HandleLabelTrackClick(LabelTrack * lTrack, wxRect &rect, wxMouseEvent & event);