From c300c339017aeb3d6ea2cbd172968baa56a8c559 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@gmail.com>
Date: Sun, 6 Sep 2015 12:37:05 -0400
Subject: [PATCH] Remove a few unused members from class TrackPanel, and an
 unused #include

---
 src/Snap.cpp       |  1 -
 src/TrackPanel.cpp |  5 +----
 src/TrackPanel.h   | 19 +------------------
 3 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/src/Snap.cpp b/src/Snap.cpp
index 7e533a241..15b8fb062 100644
--- a/src/Snap.cpp
+++ b/src/Snap.cpp
@@ -16,7 +16,6 @@
 
 #include "Project.h"
 #include "LabelTrack.h"
-#include "TrackPanel.h"
 #include "WaveTrack.h"
 
 #include <wx/arrimpl.cpp>
diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp
index 1ce35f368..356cb3cde 100644
--- a/src/TrackPanel.cpp
+++ b/src/TrackPanel.cpp
@@ -436,7 +436,6 @@ TrackPanel::TrackPanel(wxWindow * parent, wxWindowID id,
      mRuler(ruler),
      mTrackArtist(nullptr),
      mRefreshBacking(false),
-     mConverter(NumericConverter::TIME),
      mAutoScrolling(false),
      mVertScrollRemainder(0),
      vrulerSize(36,0)
@@ -474,8 +473,6 @@ TrackPanel::TrackPanel(wxWindow * parent, wxWindowID id,
    mSlideCursor   = MakeCursor( wxCURSOR_SIZEWE,    TimeCursorXpm,    16, 16);
    mZoomInCursor  = MakeCursor( wxCURSOR_MAGNIFIER, ZoomInCursorXpm,  19, 15);
    mZoomOutCursor = MakeCursor( wxCURSOR_MAGNIFIER, ZoomOutCursorXpm, 19, 15);
-   mLabelCursorLeft  = MakeCursor( wxCURSOR_ARROW,  LabelCursorLeftXpm, 19, 15);
-   mLabelCursorRight = MakeCursor( wxCURSOR_ARROW,  LabelCursorRightXpm, 16, 16);
    
 #ifdef EXPERIMENTAL_SPECTRAL_EDITING
    mBottomFrequencyCursor =
@@ -1357,7 +1354,7 @@ bool TrackPanel::SetCursorByActivity( )
    case IsAdjustingLabel:
    case IsSelectingLabelText:
       return true;
-#ifdef USE_MIDI
+#if 0
    case IsStretching:
       SetCursor( unsafe
          ? *mDisabledCursor
diff --git a/src/TrackPanel.h b/src/TrackPanel.h
index 3b445c1c2..a28848a91 100644
--- a/src/TrackPanel.h
+++ b/src/TrackPanel.h
@@ -686,18 +686,6 @@ protected:
    wxRect mCapturedTrackLocationRect;
    wxRect mCapturedRect;
 
-   // When sliding horizontally, the moving clip may automatically
-   // snap to the beginning and ending of other clips, or to label
-   // starts and stops.  When you start sliding, SlideSnapFromPoints
-   // gets populated with the start and stop times of selected clips,
-   // and SlideSnapToPoints gets populated with the start and stop times
-   // of other clips.  In both cases, times that are within 3 pixels
-   // of another at the same zoom level are eliminated; you can't snap
-   // when there are two things arbitrarily close at that zoom level.
-   wxBaseArrayDouble mSlideSnapFromPoints;
-   wxBaseArrayDouble mSlideSnapToPoints;
-   wxArrayInt mSlideSnapLinePixels;
-
    bool mDidSlideVertically;
 
    bool mRedrawAfterStop;
@@ -740,8 +728,6 @@ public:
 
 protected:
 
-   NumericConverter mConverter;
-
    WaveTrack * mDrawingTrack;          // Keeps track of which track you are drawing on between events cf. HandleDraw()
    int mDrawingTrackTop;           // Keeps track of the top position of the drawing track.
    sampleCount mDrawingStartSample;   // sample of last click-down
@@ -812,9 +798,6 @@ protected:
       IsMinimizing,
       WasOverCutLine,
       IsPopping,
-#ifdef USE_MIDI
-      IsStretching,
-#endif
       IsZooming,
 #ifdef EXPERIMENTAL_MIDI_OUT
       IsVelocitySliding,
@@ -840,7 +823,7 @@ protected:
       mResizeCursor, mSlideCursor, mEnvelopeCursor, // doubles as the center frequency cursor
                               // for spectral selection
       mSmoothCursor, mZoomInCursor, mZoomOutCursor,
-      mLabelCursorLeft, mLabelCursorRight, mRearrangeCursor,
+      mRearrangeCursor,
       mDisabledCursor, mAdjustLeftSelectionCursor, mAdjustRightSelectionCursor;
 #ifdef EXPERIMENTAL_SPECTRAL_EDITING
    std::unique_ptr<wxCursor>