From 674ccc5e15b8547c7db0893d00c942ede742714e Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Sat, 10 Jun 2017 17:02:01 -0400
Subject: [PATCH] Clean up last bits of old popup menu code

---
 src/Menus.cpp      |  3 ---
 src/TrackPanel.cpp | 57 ++++------------------------------------------
 src/TrackPanel.h   |  6 -----
 3 files changed, 5 insertions(+), 61 deletions(-)

diff --git a/src/Menus.cpp b/src/Menus.cpp
index bfb851ba8..67fd7cf78 100644
--- a/src/Menus.cpp
+++ b/src/Menus.cpp
@@ -1886,9 +1886,6 @@ void AudacityProject::RebuildMenuBar()
 
 void AudacityProject::RebuildOtherMenus()
 {
-   if (mTrackPanel) {
-      mTrackPanel->BuildMenus();
-   }
 }
 
 CommandFlag AudacityProject::GetFocusedFrame()
diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp
index 448cf4d5e..a7d5cf8e9 100644
--- a/src/TrackPanel.cpp
+++ b/src/TrackPanel.cpp
@@ -277,10 +277,6 @@ template < class CLIPPEE, class CLIPVAL >
       clippee = val;
 }
 
-enum {
-   TrackPanelFirstID = 2000,
-};
-
 BEGIN_EVENT_TABLE(TrackPanel, OverlayPanel)
     EVT_MOUSE_EVENTS(TrackPanel::OnMouseEvent)
     EVT_MOUSE_CAPTURE_LOST(TrackPanel::OnCaptureLost)
@@ -395,7 +391,6 @@ TrackPanel::TrackPanel(wxWindow * parent, wxWindowID id,
    mTrackArtist->SetMargins(1, kTopMargin, kRightMargin, kBottomMargin);
 
    mCapturedTrack = NULL;
-   mPopupMenuTarget = NULL;
 
    mTimeCount = 0;
    mTimer.parent = this;
@@ -444,8 +439,6 @@ TrackPanel::~TrackPanel()
    // ALT+F4 or Command+Q
    if (HasCapture())
       ReleaseMouse();
-
-   DeleteMenus();
 }
 
 LWSlider *TrackPanel::GainSlider( const WaveTrack *wt )
@@ -479,16 +472,6 @@ SelectionState &TrackPanel::GetSelectionState()
    return GetProject()->GetSelectionState();
 }
 
-void TrackPanel::BuildMenus(void)
-{
-   // Get rid of existing menus
-   DeleteMenus();
-}
-
-void TrackPanel::DeleteMenus(void)
-{
-}
-
 #ifdef EXPERIMENTAL_OUTPUT_DISPLAY
 void TrackPanel::UpdateVirtualStereoOrder()
 {
@@ -2896,13 +2879,6 @@ void TrackPanel::OnTrackListUpdated(wxCommandEvent & e)
          ReleaseMouse();
    }
 
-   if (mPopupMenuTarget &&
-       !mTracks->Contains(mPopupMenuTarget)) {
-      mPopupMenuTarget = nullptr;
-      if (HasCapture())
-         ReleaseMouse();
-   }
-
    GetSelectionState().TrackListUpdated( *mTracks );
 
    if (e.GetClientData()) {
@@ -5171,34 +5147,11 @@ void TrackPanel::OnTrackMenu(Track *t)
          return;
    }
 
-   {
-      TrackPanelCell *const pCell = t->GetTrackControl();
-      const wxRect rect(FindTrackRect(t, true));
-      const UIHandle::Result refreshResult =
-         pCell->DoContextMenu(rect, this, NULL);
-      ProcessUIHandleResult(this, mRuler, t, t, refreshResult);
-      // TODO:  Hide following lines inside the above.
-   }
-
-   mPopupMenuTarget = t;
-
-   wxMenu *theMenu = NULL;
-
-   if (theMenu) {
-      //We need to find the location of the menu rectangle.
-      const wxRect rect = FindTrackRect(t,true);
-      wxRect titleRect;
-      mTrackInfo.GetTitleBarRect(rect, titleRect);
-
-      PopupMenu(theMenu, titleRect.x + 1,
-                  titleRect.y + titleRect.height + 1);
-   }
-
-   mPopupMenuTarget = NULL;
-
-   SetCapturedTrack(NULL);
-
-   Refresh(false);
+   TrackPanelCell *const pCell = t->GetTrackControl();
+   const wxRect rect(FindTrackRect(t, true));
+   const UIHandle::Result refreshResult =
+      pCell->DoContextMenu(rect, this, NULL);
+   ProcessUIHandleResult(this, mRuler, t, t, refreshResult);
 }
 
 Track * TrackPanel::GetFirstSelectedTrack()
diff --git a/src/TrackPanel.h b/src/TrackPanel.h
index 1c1c6c48a..b112a3c3c 100644
--- a/src/TrackPanel.h
+++ b/src/TrackPanel.h
@@ -258,10 +258,6 @@ class AUDACITY_DLL_API TrackPanel final : public OverlayPanel {
 
    virtual ~ TrackPanel();
 
-   virtual void BuildMenus(void);
-
-   virtual void DeleteMenus(void);
-
    virtual void UpdatePrefs();
    virtual void ApplyUpdatedTheme();
 
@@ -734,8 +730,6 @@ protected:
       mStretchCursor, mStretchLeftCursor, mStretchRightCursor;
 #endif
 
-   Track *mPopupMenuTarget {};
-
    friend class TrackPanelAx;
 
 #if wxUSE_ACCESSIBILITY