From c3b32d110696195fe381549cd8288e29c693557f Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Tue, 21 May 2019 13:27:14 -0400
Subject: [PATCH] Remove GetActiveProject where finding track panel button
 tooltips

---
 .../ui/PlayableTrackButtonHandles.cpp              | 14 ++++++--------
 src/tracks/ui/ButtonHandle.h                       |  2 +-
 src/tracks/ui/TrackButtonHandles.cpp               | 14 ++++++--------
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/tracks/playabletrack/ui/PlayableTrackButtonHandles.cpp b/src/tracks/playabletrack/ui/PlayableTrackButtonHandles.cpp
index e60a819e7..6d3cdedab 100644
--- a/src/tracks/playabletrack/ui/PlayableTrackButtonHandles.cpp
+++ b/src/tracks/playabletrack/ui/PlayableTrackButtonHandles.cpp
@@ -42,16 +42,15 @@ UIHandle::Result MuteButtonHandle::CommitChanges
 }
 
 TranslatableString MuteButtonHandle::Tip(
-   const wxMouseState &, AudacityProject &) const
+   const wxMouseState &, AudacityProject &project) const
 {
    auto name = XO("Mute");
-   auto project = ::GetActiveProject();
    auto focused =
-      TrackFocus::Get( *project ).Get() == GetTrack().get();
+      TrackFocus::Get( project ).Get() == GetTrack().get();
    if (!focused)
       return name;
 
-   auto &commandManager = CommandManager::Get( *project );
+   auto &commandManager = CommandManager::Get( project );
    ComponentInterfaceSymbol command{ wxT("TrackMute"), name };
    return commandManager.DescribeCommandsAndShortcuts(&command, 1u);
 }
@@ -99,16 +98,15 @@ UIHandle::Result SoloButtonHandle::CommitChanges
 }
 
 TranslatableString SoloButtonHandle::Tip(
-   const wxMouseState &, AudacityProject &) const
+   const wxMouseState &, AudacityProject &project) const
 {
    auto name = XO("Solo");
-   auto project = ::GetActiveProject();
    auto focused =
-      TrackFocus::Get( *project ).Get() == GetTrack().get();
+      TrackFocus::Get( project ).Get() == GetTrack().get();
    if (!focused)
       return name;
 
-   auto &commandManager = CommandManager::Get( *project );
+   auto &commandManager = CommandManager::Get( project );
    ComponentInterfaceSymbol command{ wxT("TrackSolo"), name };
    return commandManager.DescribeCommandsAndShortcuts( &command, 1u );
 }
diff --git a/src/tracks/ui/ButtonHandle.h b/src/tracks/ui/ButtonHandle.h
index 04dd7b7e0..99356f471 100644
--- a/src/tracks/ui/ButtonHandle.h
+++ b/src/tracks/ui/ButtonHandle.h
@@ -47,7 +47,7 @@ protected:
 
    // Define a message for the status bar and tooltip.
    virtual TranslatableString Tip(
-      const wxMouseState &state, AudacityProject &) const = 0;
+      const wxMouseState &state, AudacityProject &project) const = 0;
 
    void Enter(bool forward, AudacityProject *) final override;
 
diff --git a/src/tracks/ui/TrackButtonHandles.cpp b/src/tracks/ui/TrackButtonHandles.cpp
index 8b00dbf8e..3efa0a74c 100644
--- a/src/tracks/ui/TrackButtonHandles.cpp
+++ b/src/tracks/ui/TrackButtonHandles.cpp
@@ -173,16 +173,15 @@ UIHandle::Result CloseButtonHandle::CommitChanges
 }
 
 TranslatableString CloseButtonHandle::Tip(
-   const wxMouseState &, AudacityProject &) const
+   const wxMouseState &, AudacityProject &project) const
 {
    auto name = XO("Close");
-   auto project = ::GetActiveProject();
    auto focused =
-      TrackFocus::Get( *project ).Get() == GetTrack().get();
+      TrackFocus::Get( project ).Get() == GetTrack().get();
    if (!focused)
       return name;
 
-   auto &commandManager = CommandManager::Get( *project );
+   auto &commandManager = CommandManager::Get( project );
    ComponentInterfaceSymbol command{ wxT("TrackClose"), name };
    return commandManager.DescribeCommandsAndShortcuts( &command, 1u );
 }
@@ -234,16 +233,15 @@ UIHandle::Result MenuButtonHandle::CommitChanges
 }
 
 TranslatableString MenuButtonHandle::Tip(
-   const wxMouseState &, AudacityProject&) const
+   const wxMouseState &, AudacityProject &project) const
 {
    auto name = XO("Open menu...");
-   auto project = ::GetActiveProject();
    auto focused =
-      TrackFocus::Get( *project ).Get() == GetTrack().get();
+      TrackFocus::Get( project ).Get() == GetTrack().get();
    if (!focused)
       return name;
 
-   auto &commandManager = CommandManager::Get( *project );
+   auto &commandManager = CommandManager::Get( project );
    ComponentInterfaceSymbol command{ wxT("TrackMenu"), name };
    return commandManager.DescribeCommandsAndShortcuts( &command, 1u );
 }