From 4d29686116ec8cefd834b3be7d2c9c699884919a Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Sun, 11 Nov 2018 16:36:02 -0500 Subject: [PATCH] Remove wx/gdicmn.h from headers --- src/FreqWindow.h | 1 - src/Track.h | 1 - src/WaveClip.h | 1 - src/WaveTrack.h | 1 - src/effects/AutoDuck.h | 2 -- src/effects/Compressor.h | 1 - src/tracks/labeltrack/ui/LabelGlyphHandle.h | 1 - src/tracks/labeltrack/ui/LabelTextHandle.h | 1 - src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.h | 1 - src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.h | 1 - src/tracks/playabletrack/wavetrack/ui/SampleHandle.h | 1 - src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.h | 1 - src/tracks/ui/ButtonHandle.h | 1 - src/tracks/ui/EnvelopeHandle.h | 1 - src/tracks/ui/SelectHandle.h | 2 -- src/tracks/ui/SliderHandle.h | 1 - src/tracks/ui/ZoomHandle.h | 1 - src/widgets/Grabber.h | 1 - src/widgets/Meter.h | 1 - src/widgets/Ruler.h | 1 - 20 files changed, 22 deletions(-) diff --git a/src/FreqWindow.h b/src/FreqWindow.h index 9bd810901..54d73cead 100644 --- a/src/FreqWindow.h +++ b/src/FreqWindow.h @@ -15,7 +15,6 @@ #include #include #include -#include #include // member variable #include // to inherit #include "SampleFormat.h" diff --git a/src/Track.h b/src/Track.h index e8fa162ca..e72765eeb 100644 --- a/src/Track.h +++ b/src/Track.h @@ -19,7 +19,6 @@ #include #include #include -#include #include #include "SampleFormat.h" diff --git a/src/WaveClip.h b/src/WaveClip.h index 5987813dd..1329c1182 100644 --- a/src/WaveClip.h +++ b/src/WaveClip.h @@ -22,7 +22,6 @@ #include "RealFFTf.h" -#include #include #include diff --git a/src/WaveTrack.h b/src/WaveTrack.h index 465abc3c9..88b9492b8 100644 --- a/src/WaveTrack.h +++ b/src/WaveTrack.h @@ -16,7 +16,6 @@ #include "widgets/ProgressDialog.h" #include -#include #include #include "WaveTrackLocation.h" diff --git a/src/effects/AutoDuck.h b/src/effects/AutoDuck.h index 576eafcbd..ebf866b98 100644 --- a/src/effects/AutoDuck.h +++ b/src/effects/AutoDuck.h @@ -11,8 +11,6 @@ #ifndef __AUDACITY_EFFECT_AUTODUCK__ #define __AUDACITY_EFFECT_AUTODUCK__ -#include - #include "Effect.h" #include "../widgets/wxPanelWrapper.h" diff --git a/src/effects/Compressor.h b/src/effects/Compressor.h index b8e311bc3..63a8619c5 100644 --- a/src/effects/Compressor.h +++ b/src/effects/Compressor.h @@ -11,7 +11,6 @@ #ifndef __AUDACITY_EFFECT_COMPRESSOR__ #define __AUDACITY_EFFECT_COMPRESSOR__ -#include #include "../widgets/wxPanelWrapper.h" #include "TwoPassSimpleMono.h" diff --git a/src/tracks/labeltrack/ui/LabelGlyphHandle.h b/src/tracks/labeltrack/ui/LabelGlyphHandle.h index 3f2702496..b83f46d81 100644 --- a/src/tracks/labeltrack/ui/LabelGlyphHandle.h +++ b/src/tracks/labeltrack/ui/LabelGlyphHandle.h @@ -12,7 +12,6 @@ Paul Licameli split from TrackPanel.cpp #define __AUDACITY_LABEL_GLYPH_HANDLE__ #include "LabelDefaultClickHandle.h" -#include #include "../../../MemoryX.h" class wxMouseState; diff --git a/src/tracks/labeltrack/ui/LabelTextHandle.h b/src/tracks/labeltrack/ui/LabelTextHandle.h index 1df1835e2..0d1b80a6c 100644 --- a/src/tracks/labeltrack/ui/LabelTextHandle.h +++ b/src/tracks/labeltrack/ui/LabelTextHandle.h @@ -14,7 +14,6 @@ Paul Licameli split from TrackPanel.cpp #include "LabelDefaultClickHandle.h" #include "../../../MemoryX.h" #include "../../../SelectedRegion.h" -#include class wxMouseState; class LabelTrack; diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.h b/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.h index 0b62b594b..56d4ddb1f 100644 --- a/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.h +++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.h @@ -14,7 +14,6 @@ Paul Licameli split from TrackPanel.cpp class wxMouseState; class NoteTrack; -#include #include "../../../../MemoryX.h" #include "../../../../UIHandle.h" diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.h b/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.h index 531760f61..14a03ed17 100644 --- a/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.h +++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.h @@ -16,7 +16,6 @@ class NoteTrack; #include "../../../../MemoryX.h" #include "../../../../UIHandle.h" -#include class NoteTrackVZoomHandle : public UIHandle { diff --git a/src/tracks/playabletrack/wavetrack/ui/SampleHandle.h b/src/tracks/playabletrack/wavetrack/ui/SampleHandle.h index 7bb1fe325..8bb74f744 100644 --- a/src/tracks/playabletrack/wavetrack/ui/SampleHandle.h +++ b/src/tracks/playabletrack/wavetrack/ui/SampleHandle.h @@ -17,7 +17,6 @@ Paul Licameli class wxMouseEvent; class wxMouseState; -#include class Track; class ViewInfo; diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.h b/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.h index 56f5e2517..bee59773e 100644 --- a/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.h +++ b/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.h @@ -13,7 +13,6 @@ Paul Licameli split from TrackPanel.cpp class wxMouseState; class WaveTrack; -#include #include "../../../../MemoryX.h" #include "../../../../UIHandle.h" diff --git a/src/tracks/ui/ButtonHandle.h b/src/tracks/ui/ButtonHandle.h index 9aaf34278..04a33f4ac 100644 --- a/src/tracks/ui/ButtonHandle.h +++ b/src/tracks/ui/ButtonHandle.h @@ -16,7 +16,6 @@ Paul Licameli class wxMouseEvent; class wxMouseState; -#include class Track; diff --git a/src/tracks/ui/EnvelopeHandle.h b/src/tracks/ui/EnvelopeHandle.h index 75e3ce4a8..e887d87f8 100644 --- a/src/tracks/ui/EnvelopeHandle.h +++ b/src/tracks/ui/EnvelopeHandle.h @@ -18,7 +18,6 @@ Paul Licameli split from TrackPanel.cpp class wxMouseEvent; class wxMouseState; -#include class Envelope; class EnvelopeEditor; diff --git a/src/tracks/ui/SelectHandle.h b/src/tracks/ui/SelectHandle.h index 0a729cb2b..6cba35b62 100644 --- a/src/tracks/ui/SelectHandle.h +++ b/src/tracks/ui/SelectHandle.h @@ -18,8 +18,6 @@ Paul Licameli split from TrackPanel.cpp #include "../../MemoryX.h" #include -#include - class SelectionStateChanger; class SnapManager; class SpectrumAnalyst; diff --git a/src/tracks/ui/SliderHandle.h b/src/tracks/ui/SliderHandle.h index 0a40d56bc..b27a9e637 100644 --- a/src/tracks/ui/SliderHandle.h +++ b/src/tracks/ui/SliderHandle.h @@ -13,7 +13,6 @@ Paul Licameli #include "../../MemoryX.h" #include "../../UIHandle.h" -#include class wxMouseEvent; class LWSlider; diff --git a/src/tracks/ui/ZoomHandle.h b/src/tracks/ui/ZoomHandle.h index b9927b3a7..4eed93e14 100644 --- a/src/tracks/ui/ZoomHandle.h +++ b/src/tracks/ui/ZoomHandle.h @@ -14,7 +14,6 @@ Paul Licameli split from TrackPanel.cpp #include "../../UIHandle.h" class wxMouseState; -#include // This handle class, unlike most, doesn't associate with any particular cell. class ZoomHandle final : public UIHandle diff --git a/src/widgets/Grabber.h b/src/widgets/Grabber.h index 408624205..a82139d7a 100644 --- a/src/widgets/Grabber.h +++ b/src/widgets/Grabber.h @@ -32,7 +32,6 @@ flicker-free use. #include "../Audacity.h" #include -#include #include // to inherit //////////////////////////////////////////////////////////// diff --git a/src/widgets/Meter.h b/src/widgets/Meter.h index c3151a889..cc2f74d14 100644 --- a/src/widgets/Meter.h +++ b/src/widgets/Meter.h @@ -19,7 +19,6 @@ #include // for wxUSE_* macros #include // member variable #include -#include #include #include "../SampleFormat.h" diff --git a/src/widgets/Ruler.h b/src/widgets/Ruler.h index 8992b854c..382721120 100644 --- a/src/widgets/Ruler.h +++ b/src/widgets/Ruler.h @@ -14,7 +14,6 @@ #include "wxPanelWrapper.h" #include // member variable -#include #include // member variable #include