From 3d7471a612eac5e1bc82024e7694299f6d9385a7 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Fri, 30 Jun 2017 22:23:54 -0400 Subject: [PATCH] new file --- mac/Audacity.xcodeproj/project.pbxproj | 2 ++ src/Makefile.am | 1 + src/Makefile.in | 6 ++-- src/TrackPanelDrawingContext.h | 28 +++++++++++++++++++ win/Projects/Audacity/Audacity.vcxproj | 1 + .../Audacity/Audacity.vcxproj.filters | 3 ++ 6 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 src/TrackPanelDrawingContext.h diff --git a/mac/Audacity.xcodeproj/project.pbxproj b/mac/Audacity.xcodeproj/project.pbxproj index 16ebbc0ae..886abcb03 100644 --- a/mac/Audacity.xcodeproj/project.pbxproj +++ b/mac/Audacity.xcodeproj/project.pbxproj @@ -3061,6 +3061,7 @@ 5E3FFE701EC9032B0020F7C9 /* NoteTrackSliderHandles.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NoteTrackSliderHandles.cpp; sourceTree = ""; }; 5E3FFE711EC9032B0020F7C9 /* NoteTrackSliderHandles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NoteTrackSliderHandles.h; sourceTree = ""; }; 5E4685F81CCA9D84008741F2 /* CommandFunctors.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CommandFunctors.h; sourceTree = ""; }; + 5E52335F1EFDD57D001E4BB8 /* TrackPanelDrawingContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TrackPanelDrawingContext.h; sourceTree = ""; }; 5E61EE0C1CBAA6BB0009FCF1 /* MemoryX.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MemoryX.h; sourceTree = ""; }; 5E667A5E1F0BEE5F00C942A5 /* WaveTrackVZoomHandle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WaveTrackVZoomHandle.cpp; sourceTree = ""; }; 5E667A5F1F0BEE5F00C942A5 /* WaveTrackVZoomHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WaveTrackVZoomHandle.h; sourceTree = ""; }; @@ -4157,6 +4158,7 @@ 1790B0EF09883BFD008A330A /* TrackPanelAx.h */, 5E74D2D91CC4427B00D88B0B /* TrackPanelCell.h */, 5E74D2DA1CC4427B00D88B0B /* TrackPanelCellIterator.h */, + 5E52335F1EFDD57D001E4BB8 /* TrackPanelDrawingContext.h */, 2803C8B619F35AA000278526 /* TrackPanelListener.h */, 5E15123A1DB000C000702E29 /* TrackPanelMouseEvent.h */, 5E7396611DAFDB1E00BA0A4D /* TrackPanelResizeHandle.h */, diff --git a/src/Makefile.am b/src/Makefile.am index 900774196..ea1fbae5e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -247,6 +247,7 @@ audacity_SOURCES = \ TrackPanelAx.h \ TrackPanelCell.h \ TrackPanelCellIterator.h \ + TrackPanelDrawingContext.h \ TrackPanelListener.h \ TrackPanelMouseEvent.h \ TrackPanelResizeHandle.cpp \ diff --git a/src/Makefile.in b/src/Makefile.in index 1e79794ec..3596499f5 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -328,7 +328,8 @@ am__audacity_SOURCES_DIST = BlockFile.cpp BlockFile.h DirManager.cpp \ TimerRecordDialog.cpp TimerRecordDialog.h TimeTrack.cpp \ TimeTrack.h Track.cpp Track.h TrackArtist.cpp TrackArtist.h \ TrackPanel.cpp TrackPanel.h TrackPanelAx.cpp TrackPanelAx.h \ - TrackPanelCell.h TrackPanelCellIterator.h TrackPanelListener.h \ + TrackPanelCell.h TrackPanelCellIterator.h \ + TrackPanelDrawingContext.h TrackPanelListener.h \ TrackPanelMouseEvent.h TrackPanelResizeHandle.cpp \ TrackPanelResizeHandle.h TrackPanelResizerCell.cpp \ TrackPanelResizerCell.h TranslatableStringArray.h UIHandle.h \ @@ -1342,7 +1343,8 @@ audacity_SOURCES = $(libaudacity_la_SOURCES) AboutDialog.cpp \ TimerRecordDialog.cpp TimerRecordDialog.h TimeTrack.cpp \ TimeTrack.h Track.cpp Track.h TrackArtist.cpp TrackArtist.h \ TrackPanel.cpp TrackPanel.h TrackPanelAx.cpp TrackPanelAx.h \ - TrackPanelCell.h TrackPanelCellIterator.h TrackPanelListener.h \ + TrackPanelCell.h TrackPanelCellIterator.h \ + TrackPanelDrawingContext.h TrackPanelListener.h \ TrackPanelMouseEvent.h TrackPanelResizeHandle.cpp \ TrackPanelResizeHandle.h TrackPanelResizerCell.cpp \ TrackPanelResizerCell.h TranslatableStringArray.h UIHandle.h \ diff --git a/src/TrackPanelDrawingContext.h b/src/TrackPanelDrawingContext.h new file mode 100644 index 000000000..f55cacdf4 --- /dev/null +++ b/src/TrackPanelDrawingContext.h @@ -0,0 +1,28 @@ +/********************************************************************** + + Audacity: A Digital Audio Editor + + TrackPanelDrawingContext.h + + Paul Licameli + + **********************************************************************/ + +#ifndef __AUDACITY_TRACK_PANEL_DRAWING_CONTEXT__ +#define __AUDACITY_TRACK_PANEL_DRAWING_CONTEXT__ + +#include "MemoryX.h" + +class UIHandle; +using UIHandlePtr = std::shared_ptr; +class wxDC; + +#include + +struct TrackPanelDrawingContext { + wxDC &dc; + UIHandlePtr target; + wxMouseState lastState; +}; + +#endif diff --git a/win/Projects/Audacity/Audacity.vcxproj b/win/Projects/Audacity/Audacity.vcxproj index 0131c3aba..57af61d3a 100755 --- a/win/Projects/Audacity/Audacity.vcxproj +++ b/win/Projects/Audacity/Audacity.vcxproj @@ -508,6 +508,7 @@ + diff --git a/win/Projects/Audacity/Audacity.vcxproj.filters b/win/Projects/Audacity/Audacity.vcxproj.filters index 7ba58244e..1cf7e738a 100755 --- a/win/Projects/Audacity/Audacity.vcxproj.filters +++ b/win/Projects/Audacity/Audacity.vcxproj.filters @@ -1933,6 +1933,9 @@ src + + src + src