From bf3f041abea992da6a7068044eef7d0ac76298c9 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Mon, 12 Jun 2017 13:33:07 -0400
Subject: [PATCH] Make TrackInfo routines that calculate rectangles static

---
 src/TrackPanel.cpp | 18 +++++++++---------
 src/TrackPanel.h   | 20 ++++++++++----------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp
index ba7290f51..90c0e8a70 100644
--- a/src/TrackPanel.cpp
+++ b/src/TrackPanel.cpp
@@ -8891,7 +8891,7 @@ int TrackInfo::GetTrackInfoWidth() const
    return kTrackInfoWidth;
 }
 
-void TrackInfo::GetCloseBoxRect(const wxRect & rect, wxRect & dest) const
+void TrackInfo::GetCloseBoxRect(const wxRect & rect, wxRect & dest)
 {
    dest.x = rect.x;
    auto results = CalcItemY( commonTrackTCPLines, kItemBarButtons );
@@ -8900,7 +8900,7 @@ void TrackInfo::GetCloseBoxRect(const wxRect & rect, wxRect & dest) const
    dest.height = results.second;
 }
 
-void TrackInfo::GetTitleBarRect(const wxRect & rect, wxRect & dest) const
+void TrackInfo::GetTitleBarRect(const wxRect & rect, wxRect & dest)
 {
    // to right of CloseBoxRect, plus a little more
    dest.x = rect.x + kTrackInfoBtnSize + 1;
@@ -8911,7 +8911,7 @@ void TrackInfo::GetTitleBarRect(const wxRect & rect, wxRect & dest) const
    dest.height = results.second;
 }
 
-void TrackInfo::GetMuteSoloRect(const wxRect & rect, wxRect & dest, bool solo, bool bHasSoloButton, const Track *pTrack) const
+void TrackInfo::GetMuteSoloRect(const wxRect & rect, wxRect & dest, bool solo, bool bHasSoloButton, const Track *pTrack)
 {
 
    dest.x = rect.x;
@@ -8949,7 +8949,7 @@ void TrackInfo::GetMuteSoloRect(const wxRect & rect, wxRect & dest, bool solo, b
 
 }
 
-void TrackInfo::GetGainRect(const wxPoint &topleft, wxRect & dest) const
+void TrackInfo::GetGainRect(const wxPoint &topleft, wxRect & dest)
 {
    dest.x = topleft.x + 6;
    auto results = CalcItemY( waveTrackTCPLines, kItemGain );
@@ -8958,7 +8958,7 @@ void TrackInfo::GetGainRect(const wxPoint &topleft, wxRect & dest) const
    dest.height = results.second;
 }
 
-void TrackInfo::GetPanRect(const wxPoint &topleft, wxRect & dest) const
+void TrackInfo::GetPanRect(const wxPoint &topleft, wxRect & dest)
 {
    GetGainRect( topleft, dest );
    auto results = CalcItemY( waveTrackTCPLines, kItemPan );
@@ -8966,7 +8966,7 @@ void TrackInfo::GetPanRect(const wxPoint &topleft, wxRect & dest) const
 }
 
 #ifdef EXPERIMENTAL_MIDI_OUT
-void TrackInfo::GetVelocityRect(const wxPoint &topleft, wxRect & dest) const
+void TrackInfo::GetVelocityRect(const wxPoint &topleft, wxRect & dest)
 {
    dest.x = topleft.x + 6;
    auto results = CalcItemY( noteTrackTCPLines, kItemVelocity );
@@ -8976,7 +8976,7 @@ void TrackInfo::GetVelocityRect(const wxPoint &topleft, wxRect & dest) const
 }
 #endif
 
-void TrackInfo::GetMinimizeRect(const wxRect & rect, wxRect &dest) const
+void TrackInfo::GetMinimizeRect(const wxRect & rect, wxRect &dest)
 {
    const int space = 0;// was 3.
    dest.x = rect.x + space;
@@ -8989,7 +8989,7 @@ void TrackInfo::GetMinimizeRect(const wxRect & rect, wxRect &dest) const
    dest.height = results.second;
 }
 
-void TrackInfo::GetSyncLockIconRect(const wxRect & rect, wxRect &dest) const
+void TrackInfo::GetSyncLockIconRect(const wxRect & rect, wxRect &dest)
 {
    dest.x = rect.x + rect.width - kTrackInfoBtnSize; // to right of minimize button
    auto results = CalcBottomItemY
@@ -9000,7 +9000,7 @@ void TrackInfo::GetSyncLockIconRect(const wxRect & rect, wxRect &dest) const
 }
 
 #ifdef USE_MIDI
-void TrackInfo::GetMidiControlsRect(const wxRect & rect, wxRect & dest) const
+void TrackInfo::GetMidiControlsRect(const wxRect & rect, wxRect & dest)
 {
    dest.x = rect.x + 1; // To center slightly
    // PRL: TODO: kMidiCellWidth is defined in terms of the other constant
diff --git a/src/TrackPanel.h b/src/TrackPanel.h
index 0d72eca4d..afddf8624 100644
--- a/src/TrackPanel.h
+++ b/src/TrackPanel.h
@@ -102,19 +102,19 @@ private:
    // Draw the minimize button *and* the sync-lock track icon, if necessary.
    void DrawMinimize(wxDC * dc, const wxRect & rect, Track * t, bool down) const;
 
-   void GetCloseBoxRect(const wxRect & rect, wxRect &dest) const;
-   void GetTitleBarRect(const wxRect & rect, wxRect &dest) const;
-   void GetMuteSoloRect(const wxRect & rect, wxRect &dest, bool solo, bool bHasSoloButton,
-                        const Track *pTrack) const;
-   void GetGainRect(const wxPoint & topLeft, wxRect &dest) const;
-   void GetPanRect(const wxPoint & topLeft, wxRect &dest) const;
+   static void GetCloseBoxRect(const wxRect & rect, wxRect &dest);
+   static void GetTitleBarRect(const wxRect & rect, wxRect &dest);
+   static void GetMuteSoloRect(const wxRect & rect, wxRect &dest, bool solo, bool bHasSoloButton,
+                        const Track *pTrack);
+   static void GetGainRect(const wxPoint & topLeft, wxRect &dest);
+   static void GetPanRect(const wxPoint & topLeft, wxRect &dest);
 #ifdef EXPERIMENTAL_MIDI_OUT
-   void GetVelocityRect(const wxPoint & topLeft, wxRect &dest) const;
+   static void GetVelocityRect(const wxPoint & topLeft, wxRect &dest);
 #endif
-   void GetMinimizeRect(const wxRect & rect, wxRect &dest) const;
-   void GetSyncLockIconRect(const wxRect & rect, wxRect &dest) const;
+   static void GetMinimizeRect(const wxRect & rect, wxRect &dest);
+   static void GetSyncLockIconRect(const wxRect & rect, wxRect &dest);
 #ifdef USE_MIDI
-   void GetMidiControlsRect(const wxRect & rect, wxRect &dest) const;
+   static void GetMidiControlsRect(const wxRect & rect, wxRect &dest);
 #endif
 
 public: