From fa010f643b2ead1c693f8d09d4bf0ee60e20c2e9 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Tue, 11 Jul 2017 14:17:06 -0400
Subject: [PATCH] Fix #include paths, and unnecessary redrawing

---
 src/tracks/labeltrack/ui/LabelTextHandle.cpp                   | 2 +-
 src/tracks/playabletrack/wavetrack/ui/SampleHandle.cpp         | 2 +-
 src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.cpp | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/tracks/labeltrack/ui/LabelTextHandle.cpp b/src/tracks/labeltrack/ui/LabelTextHandle.cpp
index 553031c8d..5127a8a8b 100644
--- a/src/tracks/labeltrack/ui/LabelTextHandle.cpp
+++ b/src/tracks/labeltrack/ui/LabelTextHandle.cpp
@@ -10,7 +10,7 @@ Paul Licameli split from TrackPanel.cpp
 
 #include "../../../Audacity.h"
 #include "LabelTextHandle.h"
-#include "../../Experimental.h"
+#include "../../../Experimental.h"
 #include "../../../HitTestResult.h"
 #include "../../../LabelTrack.h"
 #include "../../../Project.h"
diff --git a/src/tracks/playabletrack/wavetrack/ui/SampleHandle.cpp b/src/tracks/playabletrack/wavetrack/ui/SampleHandle.cpp
index 6cb696ce2..3986e2118 100644
--- a/src/tracks/playabletrack/wavetrack/ui/SampleHandle.cpp
+++ b/src/tracks/playabletrack/wavetrack/ui/SampleHandle.cpp
@@ -10,7 +10,7 @@ Paul Licameli split from TrackPanel.cpp
 
 #include "../../../../Audacity.h"
 #include "SampleHandle.h"
-#include "../../Experimental.h"
+#include "../../../../Experimental.h"
 
 #include <algorithm>
 #include "../../../../MemoryX.h"
diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.cpp b/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.cpp
index 44dc9958f..3fddba45e 100644
--- a/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.cpp
+++ b/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.cpp
@@ -49,7 +49,9 @@ WaveTrackVZoomHandle::WaveTrackVZoomHandle
    : mZoomStart(y), mZoomEnd(y), mRect(rect)
    , mpTrack{ pTrack }
 {
+#ifdef EXPERIMENTAL_TRACK_PANEL_HIGHLIGHTING
    mChangeHighlight = RefreshCode::RefreshCell;
+#endif
 }
 
 void WaveTrackVZoomHandle::DoZoom