From 6b5161f9d90f28bf73a6fca4336fffe61586611b Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Tue, 11 Jun 2019 03:44:28 -0400 Subject: [PATCH] NoteTrackVZoomHandle.cpp compilable with WaveTrack.h ... ... which it doesn't actually include, except with precompiled headers in the Windows build --- .../notetrack/ui/NoteTrackVZoomHandle.cpp | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp b/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp index aafce84f6..9ffe8e9e5 100644 --- a/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp +++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp @@ -138,20 +138,6 @@ HitTestPreview NoteTrackVZoomHandle::Preview return HitPreview(st.state); } -// Note that these can be with or without spectrum view which -// adds a constant. -//const int kZoom1to1 = 1; -//const int kZoomTimes2 = 2; -//const int kZoomDiv2 = 3; -//const int kZoomHalfWave = 4; -//const int kZoomInByDrag = 5; -const int kZoomIn = 6; -const int kZoomOut = 7; -const int kZoomReset = 8; -const int kZoomMax = 9; -const int kUpOctave = 10; -const int kDownOctave = 11; - enum { OnZoomFitVerticalID = 20000, OnZoomResetID, @@ -187,6 +173,22 @@ public: static NoteTrackVRulerMenuTable &Instance(); protected: + enum { +// Note that these can be with or without spectrum view which +// adds a constant. +//const int kZoom1to1 = 1; +//const int kZoomTimes2 = 2; +//const int kZoomDiv2 = 3; +//const int kZoomHalfWave = 4; +//const int kZoomInByDrag = 5; + kZoomIn = 6, + kZoomOut = 7, + kZoomReset = 8, + kZoomMax = 9, + kUpOctave = 10, + kDownOctave = 11, + }; + InitMenuData *mpData {}; void OnZoom( int iZoomCode ); // void OnZoomFitVertical(wxCommandEvent&){ OnZoom( kZoom1to1 );};