include <wx/setup.h> in all files where wxUSE* macros are used...

... even if it's redundant; improving on what was done at b47e2f9

src/AdornedRulerPanel.cpp

@@ -23,6 +23,7 @@
 
 #include "Experimental.h"
 
+#include <wx/setup.h> // for wxUSE_* macros
 #include <wx/tooltip.h>
 
 #include "AColor.h"

src/AudacityApp.cpp

@@ -28,6 +28,7 @@ It handles initialization and termination by subclassing wxApp.
 
 #include "TranslatableStringArray.h"
 
+#include <wx/setup.h> // for wxUSE_* macros
 #include <wx/defs.h>
 #include <wx/app.h>
 #include <wx/bitmap.h>

src/BatchProcessDialog.cpp

@@ -17,6 +17,7 @@
 #include "Audacity.h"
 #include "BatchProcessDialog.h"
 
+#include <wx/setup.h> // for wxUSE_* macros
 #include <wx/defs.h>
 #include <wx/checkbox.h>
 #include <wx/choice.h>

src/CellularPanel.cpp

@@ -30,6 +30,7 @@
 #include "Audacity.h"
 #include "CellularPanel.h"
 
+#include <wx/setup.h> // for wxUSE_* macros
 #include "Project.h"
 #include "UIHandle.h"
 #include "TrackPanelCell.h"

src/Experimental.h

@@ -219,12 +219,14 @@
 #define EXPERIMENTAL_TWO_TONE_TIME_RULER
 
 #ifndef IN_RC
-// Define to include crash reporting
-#include <wx/defs.h>
-#define EXPERIMENTAL_CRASH_REPORT
-#if !defined(wxUSE_DEBUGREPORT) || !wxUSE_DEBUGREPORT
-#undef EXPERIMENTAL_CRASH_REPORT
-#endif
+   // Define to include crash reporting
+   #define EXPERIMENTAL_CRASH_REPORT
+   #ifdef EXPERIMENTAL_CRASH_REPORT
+      #include <wx/setup.h> // for wxUSE* macros
+      #if !defined(wxUSE_DEBUGREPORT) || !wxUSE_DEBUGREPORT
+         #undef EXPERIMENTAL_CRASH_REPORT
+      #endif
+   #endif
 #endif
 
 // Paul Licameli (PRL) 31 May 2015

src/FreqWindow.cpp

@@ -45,6 +45,8 @@ and in the spectrogram spectral selection.
 
 #include <algorithm>
 
+#include <wx/setup.h> // for wxUSE_* macros
+
 #include <wx/brush.h>
 #include <wx/button.h>
 #include <wx/choice.h>

src/MixerBoard.cpp

@@ -19,6 +19,8 @@
 #include <cfloat>
 #include <math.h>
 
+#include <wx/setup.h> // for wxUSE_* macros
+
 #include <wx/dcmemory.h>
 #include <wx/icon.h>
 #include <wx/settings.h> // for wxSystemSettings::GetColour and wxSystemSettings::GetMetric

src/PluginManager.cpp

@@ -25,6 +25,7 @@ for shared and private configs - which need to move out.
 
 #include <algorithm>
 
+#include <wx/setup.h> // for wxUSE_* macros
 #include <wx/defs.h>
 #include <wx/dialog.h>
 #include <wx/dir.h>

src/Project.cpp

@@ -56,6 +56,9 @@ scroll information.  It also has some status flags.
 #include <stdio.h>
 #include <iostream>
 #include <wx/wxprec.h>
+
+#include <wx/setup.h> // for wxUSE_* macros
+
 #include <wx/apptrait.h>
 
 #include <wx/defs.h>

src/ShuttleGui.cpp

@@ -102,6 +102,7 @@ for registering for changes.
 #include "Shuttle.h"
 
 #include "MemoryX.h"
+#include <wx/setup.h> // for wxUSE_* macros
 #include <wx/wx.h>
 #include <wx/wxprec.h>
 #include <wx/listctrl.h>

src/Tags.cpp

@@ -36,6 +36,8 @@
 // For compilers that support precompilation, includes "wx/wx.h".
 #include <wx/wxprec.h>
 
+#include <wx/setup.h> // for wxUSE_* macros
+
 #ifndef WX_PRECOMP
 // Include your minimal set of headers here, or wx.h
 #include <wx/window.h>

src/TimerRecordDialog.cpp

@@ -23,6 +23,8 @@
 
 #include "FileNames.h"
 
+#include <wx/setup.h> // for wxUSE_* macros
+
 #include <wx/defs.h>
 #include <wx/dir.h>
 #include <wx/datetime.h>

src/TrackPanel.cpp

@@ -63,6 +63,8 @@ is time to refresh some aspect of the screen.
 #include "Audacity.h" // for USE_* macros
 #include "TrackPanel.h"
 
+#include <wx/setup.h> // for wxUSE_* macros
+
 #include "Experimental.h"
 
 #include "AdornedRulerPanel.h"

src/TrackPanel.h

@@ -17,7 +17,7 @@
 #include "MemoryX.h"
 #include <vector>
 
-#include <wx/defs.h> // for wxUSE_ACCESSIBILITY
+#include <wx/setup.h> // for wxUSE_* macros
 #include <wx/timer.h>
 
 #include "HitTestResult.h"

src/TrackPanelAx.cpp

@@ -20,6 +20,8 @@
 // For compilers that support precompilation, includes "wx/wx.h".
 #include <wx/wxprec.h>
 
+#include <wx/setup.h> // for wxUSE_* macros
+
 #ifndef WX_PRECOMP
 // Include your minimal set of headers here, or wx.h
 #include <wx/wx.h>

src/TrackPanelAx.h

@@ -15,7 +15,7 @@
 #include <wx/window.h>
 #include <wx/panel.h>
 
-#include <wx/defs.h> // for wxUSE_ACCESSIBILITY
+#include <wx/setup.h> // for wxUSE_* macros
 
 #if wxUSE_ACCESSIBILITY
 #include <wx/access.h>

src/effects/Equalization.cpp

@@ -60,6 +60,8 @@
 #include <math.h>
 #include <vector>
 
+#include <wx/setup.h> // for wxUSE_* macros
+
 #include <wx/bitmap.h>
 #include <wx/button.h>
 #include <wx/brush.h>

src/effects/Equalization.h

@@ -18,7 +18,7 @@
 #define PANELBORDER 1   // only increase from '1' for testing purposes - MJS
 
 #include <wx/button.h>
-#include <wx/defs.h> // for wxUSE_ACCESSIBILITY
+#include <wx/setup.h> // for wxUSE_* macros
 #include <wx/panel.h>
 #include <wx/dialog.h>
 #include <wx/intl.h>

src/effects/Equalization48x.cpp

@@ -26,6 +26,8 @@
 #include "../float_cast.h"
 #include <vector>
 
+#include <wx/setup.h> // for wxUSE_* macros
+
 #include <wx/dcmemory.h>
 #include <wx/event.h>
 #include <wx/string.h>

src/effects/ScienFilter.cpp

@@ -38,6 +38,8 @@ a graph for EffectScienFilter.
 #include <math.h>
 #include <float.h>
 
+#include <wx/setup.h> // for wxUSE_* macros
+
 #include <wx/brush.h>
 #include <wx/dcmemory.h>
 #include <wx/intl.h>

src/effects/ScienFilter.h

@@ -13,10 +13,11 @@ Vaughan Johnson (Preview)
 #ifndef __AUDACITY_EFFECT_SCIENFILTER__
 #define __AUDACITY_EFFECT_SCIENFILTER__
 
+#include <wx/setup.h> // for wxUSE_* macros
+
 #include <wx/arrstr.h>
 #include <wx/bitmap.h>
 #include <wx/choice.h>
-#include <wx/defs.h> // for wxUSE_ACCESSIBILITY
 #include <wx/event.h>
 #include <wx/panel.h>
 #include <wx/slider.h>

src/effects/VST/VSTEffect.cpp

@@ -42,6 +42,7 @@
 #include <limits.h>
 #include <stdio.h>
 
+#include <wx/setup.h> // for wxUSE_* macros
 #include <wx/dynlib.h>
 #include <wx/app.h>
 #include <wx/defs.h>

src/effects/ladspa/LadspaEffect.cpp

@@ -29,6 +29,7 @@ effects from this one class.
 
 #include <float.h>
 
+#include <wx/setup.h> // for wxUSE_* macros
 #include <wx/wxprec.h>
 #include <wx/button.h>
 #include <wx/checkbox.h>

src/prefs/KeyConfigPrefs.cpp

@@ -23,6 +23,7 @@ KeyConfigPrefs and MousePrefs use.
 
 #include "KeyConfigPrefs.h"
 
+#include <wx/setup.h> // for wxUSE_* macros
 #include <wx/defs.h>
 #include <wx/ffile.h>
 #include <wx/intl.h>

src/prefs/PrefsDialog.cpp

@@ -19,6 +19,7 @@
 
 #include "../Experimental.h"
 
+#include <wx/setup.h> // for wxUSE_* macros
 #include <wx/defs.h>
 #include <wx/button.h>
 #include <wx/dialog.h>

src/toolbars/ControlToolBar.cpp

@@ -43,6 +43,8 @@
 // For compilers that support precompilation, includes "wx/wx.h".
 #include <wx/wxprec.h>
 
+#include <wx/setup.h> // for wxUSE_* macros
+
 #ifndef WX_PRECOMP
 #include <wx/app.h>
 #include <wx/dc.h>

src/toolbars/DeviceToolBar.cpp

@@ -20,6 +20,8 @@
 // For compilers that support precompilation, includes "wx/wx.h".
 #include <wx/wxprec.h>
 
+#include <wx/setup.h> // for wxUSE_* macros
+
 #ifndef WX_PRECOMP
 #include <wx/choice.h>
 #include <wx/event.h>

src/toolbars/EditToolBar.cpp

@@ -39,6 +39,8 @@
 // For compilers that support precompilation, includes "wx/wx.h".
 #include <wx/wxprec.h>
 
+#include <wx/setup.h> // for wxUSE_* macros
+
 #ifndef WX_PRECOMP
 #include <wx/event.h>
 #include <wx/image.h>

src/toolbars/MeterToolBar.cpp

@@ -23,6 +23,8 @@
 // For compilers that support precompilation, includes "wx/wx.h".
 #include <wx/wxprec.h>
 
+#include <wx/setup.h> // for wxUSE_* macros
+
 #ifndef WX_PRECOMP
 #include <wx/event.h>
 #include <wx/intl.h>

src/toolbars/ScrubbingToolBar.cpp

@@ -19,6 +19,8 @@
 // For compilers that support precompilation, includes "wx/wx.h".
 #include <wx/wxprec.h>
 
+#include <wx/setup.h> // for wxUSE_* macros
+
 #ifndef WX_PRECOMP
 #include <wx/event.h>
 #include <wx/image.h>

src/toolbars/SelectionBar.cpp

@@ -33,6 +33,8 @@ with changes in the SelectionBar.
 // For compilers that support precompilation, includes "wx/wx.h".
 #include <wx/wxprec.h>
 
+#include <wx/setup.h> // for wxUSE_* macros
+
 #ifndef WX_PRECOMP
 #include <wx/button.h>
 #include <wx/checkbox.h>

src/toolbars/SpectralSelectionBar.cpp

@@ -38,6 +38,8 @@ with changes in the SpectralSelectionBar.
 // For compilers that support precompilation, includes "wx/wx.h".
 #include <wx/wxprec.h>
 
+#include <wx/setup.h> // for wxUSE_* macros
+
 #ifndef WX_PRECOMP
 #include <wx/defs.h>
 #include <wx/button.h>

src/toolbars/ToolBar.cpp

@@ -32,6 +32,8 @@ in which buttons can be placed.
 // For compilers that support precompilation, includes "wx/wx.h".
 #include <wx/wxprec.h>
 
+#include <wx/setup.h> // for wxUSE_* macros
+
 #ifndef WX_PRECOMP
 #include <wx/defs.h>
 #include <wx/gdicmn.h>

src/toolbars/ToolsToolBar.cpp

@@ -38,6 +38,8 @@
 // For compilers that support precompilation, includes "wx/wx.h".
 #include <wx/wxprec.h>
 
+#include <wx/setup.h> // for wxUSE_* macros
+
 #ifndef WX_PRECOMP
 #include <wx/defs.h>
 #include <wx/event.h>

src/widgets/AButton.cpp

@@ -26,6 +26,8 @@
 
 #include "../AColor.h"
 
+#include <wx/setup.h> // for wxUSE_* macros
+
 #include <wx/app.h>
 #include <wx/dcclient.h>
 #include <wx/dcmemory.h>

src/widgets/AButton.h

@@ -15,7 +15,7 @@
 #include "../MemoryX.h"
 #include <vector>
 
-#include <wx/defs.h> // for wxUSE_ACCESSIBILITY
+#include <wx/setup.h> // for wxUSE_* macros
 
 #if wxUSE_ACCESSIBILITY
 #include <wx/access.h>

src/widgets/ASlider.cpp

@@ -36,6 +36,7 @@ or ASlider.
 
 #include <math.h>
 
+#include <wx/setup.h> // for wxUSE_* macros
 #include <wx/defs.h>
 #include <wx/dcbuffer.h>
 #include <wx/dcclient.h>

src/widgets/ASlider.h

@@ -14,7 +14,8 @@
 #define __AUDACITY_SLIDER__
 
 #include "../MemoryX.h"
-#include <wx/defs.h> // for wxUSE_ACCESSIBILITY
+#include <wx/setup.h> // for wxUSE_* macros
+#include <wx/defs.h>
 #include <wx/window.h>
 #include <wx/panel.h>
 #include <wx/timer.h>

src/widgets/Grid.cpp

@@ -16,6 +16,8 @@
 #include "../Audacity.h"
 #include "Grid.h"
 
+#include <wx/setup.h> // for wxUSE_* macros
+
 #include <wx/defs.h>
 #include <wx/choice.h>
 #include <wx/dc.h>

src/widgets/Grid.h

@@ -13,7 +13,8 @@
 
 #include "../MemoryX.h"
 #include <vector>
-#include <wx/defs.h> // for wxUSE_ACCESSIBILITY
+#include <wx/setup.h> // for wxUSE_* macros
+#include <wx/defs.h>
 #include <wx/choice.h>
 #include <wx/event.h>
 #include <wx/grid.h>

src/widgets/HelpSystem.cpp

@@ -15,6 +15,7 @@
 
 #include "../Experimental.h"
 
+#include <wx/setup.h> // for wxUSE_* macros
 #include <wx/button.h>
 #include <wx/icon.h>
 #include <wx/dialog.h>

src/widgets/HtmlWindow.cpp

@@ -23,6 +23,7 @@ around to NEW positions.
 #include "../Audacity.h"
 #include "HtmlWindow.h"
 
+#include <wx/setup.h> // for wxUSE_* macros
 #include <wx/defs.h>
 
 ////////////////////////////////////////////////////////////

src/widgets/HtmlWindow.h

@@ -25,7 +25,8 @@ around to NEW positions.
 
 #include "../Audacity.h"
 
-#include <wx/defs.h> // for wxUSE_ACCESSIBILITY
+#include <wx/setup.h> // for wxUSE_* macros
+#include <wx/defs.h>
 #include <wx/html/htmlwin.h>
 
 #if wxUSE_ACCESSIBILITY

src/widgets/KeyView.cpp

@@ -14,6 +14,7 @@
 #include "../Audacity.h"
 #include "KeyView.h"
 
+#include <wx/setup.h> // for wxUSE_* macros
 #include <wx/defs.h>
 #include <wx/settings.h>
 #include <wx/vlbox.h>

src/widgets/KeyView.h

@@ -13,7 +13,8 @@
 #include "audacity/Types.h"
 
 #include <vector>
-#include <wx/defs.h> // for wxUSE_ACCESSIBILITY
+#include <wx/setup.h> // for wxUSE_* macros
+#include <wx/defs.h>
 #include <wx/arrstr.h>
 #include <wx/string.h>
 #include <wx/vlbox.h>

src/widgets/Meter.cpp

@@ -44,6 +44,7 @@
 #include "../Experimental.h"
 
 #include <algorithm>
+#include <wx/setup.h> // for wxUSE_* macros
 #include <wx/app.h>
 #include <wx/defs.h>
 #include <wx/dialog.h>

src/widgets/Meter.h

@@ -16,8 +16,9 @@
 #ifndef __AUDACITY_METER__
 #define __AUDACITY_METER__
 
+#include <wx/setup.h> // for wxUSE_* macros
 #include <wx/brush.h>
-#include <wx/defs.h> // for wxUSE_ACCESSIBILITY
+#include <wx/defs.h>
 #include <wx/gdicmn.h>
 #include <wx/string.h>
 #include <wx/timer.h>

src/widgets/NumericTextCtrl.cpp

@@ -179,6 +179,8 @@ different formats.
 #include <math.h>
 #include <limits>
 
+#include <wx/setup.h> // for wxUSE_* macros
+
 #include <wx/wx.h>
 #include <wx/dcmemory.h>
 #include <wx/font.h>

src/widgets/NumericTextCtrl.h

@@ -20,7 +20,8 @@
 #include "../MemoryX.h"
 #include "../../include/audacity/ComponentInterface.h"
 #include <vector>
-#include <wx/defs.h> // for wxUSE_ACCESSIBILITY
+#include <wx/setup.h> // for wxUSE_* macros
+#include <wx/defs.h>
 #include <wx/event.h>
 #include <wx/panel.h>
 #include <wx/stattext.h>

src/widgets/WindowAccessible.cpp

@@ -16,6 +16,7 @@ contained GetParent() which was incorrect.
 
 #include "WindowAccessible.h"
 
+#include <wx/setup.h> // for wxUSE_* macros
 #include <wx/window.h>
 
 #if wxUSE_ACCESSIBILITY

src/widgets/WindowAccessible.h

@@ -11,8 +11,7 @@
 #ifndef __AUDACITY_WINDOW_ACCESSIBLE__
 #define __AUDACITY_WINDOW_ACCESSIBLE__
 
-#include <wx/defs.h> // for wxUSE_ACCESSIBILITY
-#include <wx/setup.h>
+#include <wx/setup.h> // for wxUSE_* macros
 
 #if wxUSE_ACCESSIBILITY
 

src/widgets/numformatter.cpp

@@ -21,6 +21,8 @@
 // For compilers that support precompilation, includes "wx.h".
 #include <wx/wxprec.h>
 
+#include <wx/setup.h> // for wxUSE_* macros
+
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif

src/widgets/valnum.cpp

@@ -25,6 +25,8 @@
 // For compilers that support precompilation, includes "wx.h".
 #include <wx/wxprec.h>
 
+#include <wx/setup.h> // for wxUSE_* macros
+
 #include "ErrorDialog.h"
 
 #ifdef __BORLANDC__

src/widgets/valnum.h

@@ -12,6 +12,7 @@
 #define _WIDGETS_VALNUM_H_
 
 #include "../MemoryX.h"
+#include <wx/setup.h> // for wxUSE_* macros
 #include <wx/defs.h>
 
 #if wxUSE_VALIDATORS