Remove wx/{html/htmlwin,fileconf,dragimag,debug,dcclient}.h from *.h

include/audacity/EffectAutomationParameters.h

@@ -46,7 +46,7 @@
 #include <locale.h>
 
 #include <wx/cmdline.h>
-#include <wx/fileconf.h>
+#include <wx/fileconf.h> // to inherit
 #include <wx/intl.h>
 #include <algorithm>
 

src/AdornedRulerPanel.cpp

@@ -44,6 +44,7 @@
 #include "widgets/AButton.h"
 #include "widgets/Grabber.h"
 
+#include <wx/dcclient.h>
 #include <wx/menu.h>
 
 using std::min;

src/AutoRecovery.h

@@ -14,7 +14,6 @@
 #include "xml/XMLTagHandler.h"
 #include "xml/XMLWriter.h"
 
-#include <wx/debug.h>
 #include <wx/mstream.h>
 
 #include <unordered_map>

src/FreqWindow.cpp

@@ -51,6 +51,7 @@ and in the spectrogram spectral selection.
 #include <wx/button.h>
 #include <wx/checkbox.h>
 #include <wx/choice.h>
+#include <wx/dcclient.h>
 #include <wx/font.h>
 #include <wx/image.h>
 #include <wx/dcmemory.h>

src/Lyrics.cpp

@@ -13,6 +13,7 @@
 
 #include <math.h>
 
+#include <wx/dcclient.h>
 #include <wx/defs.h>
 #include <wx/dcmemory.h>
 #include <wx/mimetype.h>

src/MixerBoard.cpp

@@ -22,6 +22,7 @@
 #include <wx/setup.h> // for wxUSE_* macros
 
 #include <wx/bmpbuttn.h>
+#include <wx/dcclient.h>
 #include <wx/dcmemory.h>
 #include <wx/icon.h>
 #include <wx/settings.h> // for wxSystemSettings::GetColour and wxSystemSettings::GetMetric

src/NumberScale.h

@@ -14,7 +14,6 @@ Paul Licameli
 #include <algorithm>
 #include <cmath>
 #include <wx/defs.h>
-#include <wx/debug.h>
 
 enum NumberScaleType {
    nstLinear,

src/PluginManager.h

@@ -12,7 +12,6 @@
 #define __AUDACITY_PLUGINMANAGER_H__
 
 #include <wx/defs.h>
-#include <wx/fileconf.h>
 
 #include "MemoryX.h"
 #include <map>

src/Prefs.h

@@ -34,7 +34,6 @@
 #include "../include/audacity/ComponentInterface.h"
 
 #include <wx/config.h>
-#include <wx/fileconf.h>
 #include <wx/convauto.h>
 
 void InitPreferences();

src/Project.h

@@ -36,16 +36,15 @@
 #include <memory>
 #include <wx/defs.h>
 #include <wx/log.h>
-#include <wx/dragimag.h>
 #include <wx/generic/dragimgg.h>
 #include <wx/frame.h> // to inherit
 #include <wx/intl.h>
-#include <wx/dcclient.h>
 
 #include "import/ImportRaw.h" // defines TrackHolders
 
 const int AudacityProjectTimerID = 5200;
 
+class wxMemoryDC;
 class wxArrayString;
 class wxWindow;
 class wxDialog;

src/Theme.cpp

@@ -65,6 +65,7 @@ can't be.
 #include "Experimental.h"
 
 #include <wx/wxprec.h>
+#include <wx/dcclient.h>
 #include <wx/image.h>
 #include <wx/file.h>
 #include <wx/ffile.h>

src/TimeTrack.cpp

@@ -20,6 +20,7 @@
 
 #include <cfloat>
 #include <wx/wxcrtvararg.h>
+#include <wx/dc.h>
 #include <wx/intl.h>
 #include "AColor.h"
 #include "widgets/Ruler.h"

src/TrackPanel.cpp

@@ -99,6 +99,8 @@ is time to refresh some aspect of the screen.
 #include "widgets/ASlider.h"
 #include <algorithm>
 
+#include <wx/dcclient.h>
+
 wxDEFINE_EVENT(EVT_TRACK_PANEL_TIMER, wxCommandEvent);
 
 /**

src/effects/Effect.cpp

@@ -31,6 +31,7 @@ greater use in future.
 #include <wx/bmpbuttn.h>
 #include <wx/checkbox.h>
 #include <wx/choice.h>
+#include <wx/dcclient.h>
 #include <wx/dcmemory.h>
 #include <wx/defs.h>
 #include <wx/menu.h>

src/effects/Equalization.cpp

@@ -66,6 +66,7 @@
 #include <wx/button.h>
 #include <wx/brush.h>
 #include <wx/button.h>  // not really needed here
+#include <wx/dcclient.h>
 #include <wx/dcmemory.h>
 #include <wx/event.h>
 #include <wx/image.h>

src/effects/ScienFilter.cpp

@@ -42,6 +42,7 @@ a graph for EffectScienFilter.
 
 #include <wx/brush.h>
 #include <wx/choice.h>
+#include <wx/dcclient.h>
 #include <wx/dcmemory.h>
 #include <wx/intl.h>
 #include <wx/settings.h>

src/export/Export.cpp

@@ -31,6 +31,7 @@
 #include "../Audacity.h" // for USE_* macros
 #include "Export.h"
 
+#include <wx/dcclient.h>
 #include <wx/file.h>
 #include <wx/filectrl.h>
 #include <wx/filename.h>

src/toolbars/ToolBar.cpp

@@ -35,6 +35,7 @@ in which buttons can be placed.
 #include <wx/setup.h> // for wxUSE_* macros
 
 #ifndef WX_PRECOMP
+#include <wx/dcclient.h>
 #include <wx/defs.h>
 #include <wx/gdicmn.h>
 #include <wx/image.h>

src/toolbars/ToolDock.cpp

@@ -30,6 +30,7 @@
 #include <wx/wxprec.h>
 
 #ifndef WX_PRECOMP
+#include <wx/dcclient.h>
 #include <wx/defs.h>
 #include <wx/event.h>
 #include <wx/gdicmn.h>

src/toolbars/ToolManager.cpp

@@ -34,6 +34,7 @@
 
 #ifndef WX_PRECOMP
 #include <wx/app.h>
+#include <wx/dcclient.h>
 #include <wx/defs.h>
 #include <wx/event.h>
 #include <wx/frame.h>

src/tracks/ui/Scrubbing.cpp

@@ -42,6 +42,7 @@ Paul Licameli split from TrackPanel.cpp
 
 #include <wx/app.h>
 #include <wx/dc.h>
+#include <wx/dcclient.h>
 #include <wx/menu.h>
 
 // Yet another experimental scrub would drag the track under a

src/widgets/ExpandingToolBar.h

@@ -15,7 +15,7 @@
 #include <vector>
 #include <wx/defs.h>
 #include <wx/dialog.h>
-#include <wx/dragimag.h>
+#include <wx/dragimag.h> // use macros and typedefs in this header
 #include <wx/panel.h>
 #include <wx/timer.h>
 #include <wx/minifram.h>

src/widgets/HtmlWindow.h

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

src/widgets/ImageRoll.h

@@ -13,7 +13,7 @@
 #define __AUDACITY_IMAGE_ROLL__
 
 #include <vector>
-#include <wx/dcclient.h>
+#include <wx/dc.h> // for enum wxRasterOperationMode
 #include <wx/defs.h>
 #include <wx/version.h>
 #include "wxPanelWrapper.h"

src/widgets/LinkingHtmlWindow.h

@@ -16,8 +16,6 @@
 #ifndef __AUDACITY_LINKINGHTMLWINDOW__
 #define __AUDACITY_LINKINGHTMLWINDOW__
 
-#include <wx/html/htmlwin.h>
-
 #include "HtmlWindow.h"
 #include "wxPanelWrapper.h"