Remove wx/{grid,font,ffile,colour,button,bmpbuttn}.h from headers

src/AdornedRulerPanel.h

@@ -18,7 +18,6 @@
 #include <wx/bitmap.h>
 #include <wx/dc.h>
 #include <wx/dcmemory.h>
-#include <wx/font.h>
 
 class ViewInfo;
 class AudacityProject;

src/AutoRecovery.h

@@ -15,12 +15,12 @@
 #include "xml/XMLWriter.h"
 
 #include <wx/debug.h>
-#include <wx/ffile.h>
 #include <wx/hashmap.h>
 #include <wx/mstream.h>
 
 #include <unordered_map>
 
+class wxFFile;
 class AudacityProject;
 
 //

src/BlockFile.h

@@ -13,7 +13,6 @@
 #define __AUDACITY_BLOCKFILE__
 
 #include "MemoryX.h"
-#include <wx/ffile.h>
 
 #include "xml/XMLTagHandler.h"
 #include "xml/XMLWriter.h"

src/FreqWindow.h

@@ -20,7 +20,7 @@
 #include <wx/dialog.h>
 #include <wx/gdicmn.h>
 #include <wx/pen.h>
-#include <wx/font.h>
+#include <wx/font.h> // member variable
 #include <wx/scrolbar.h>
 #include <wx/statusbr.h>
 #include <wx/utils.h>

src/HistoryWindow.h

@@ -11,12 +11,12 @@
 #ifndef __AUDACITY_HISTORY_WINDOW__
 #define __AUDACITY_HISTORY_WINDOW__
 
-#include <wx/button.h>
 #include <wx/listctrl.h>
 #include <wx/spinctrl.h>
 
 #include "widgets/wxPanelWrapper.h"
 
+class wxButton;
 class wxTextCtrl;
 class AudacityProject;
 class ShuttleGui;

src/ImageManipulation.h

@@ -10,9 +10,9 @@
 
 #include "MemoryX.h"
 #include <wx/defs.h>
-#include <wx/colour.h>
 #include "Theme.h"
 
+class wxColour;
 class wxImage;
 
 // This looks at the first pixel in the image, and shifts

src/LabelDialog.h

@@ -13,13 +13,13 @@
 
 #include <vector>
 #include <wx/defs.h>
-#include <wx/grid.h>
 
 #include "Internat.h"
 #include "widgets/Grid.h"
 #include "widgets/wxPanelWrapper.h"
 
 class wxArrayString;
+class wxGridEvent;
 class TrackFactory;
 class TrackList;
 class RowData;

src/LabelTrack.h

@@ -17,11 +17,11 @@
 #include "Track.h"
 
 #include <wx/brush.h>
-#include <wx/font.h>
 #include <wx/pen.h>
 #include <wx/clipbrd.h>
 
 
+class wxFont;
 class wxKeyEvent;
 class wxMouseEvent;
 class wxTextFile;

src/MixerBoard.cpp

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

src/MixerBoard.h

@@ -15,7 +15,6 @@
 #define __AUDACITY_MIXER_BOARD__
 
 #include <wx/frame.h> // to inherit
-#include <wx/bmpbuttn.h>
 #include <wx/hashmap.h>
 #include <wx/image.h>
 #include <wx/scrolwin.h>
@@ -27,6 +26,7 @@
 #include "commands/CommandManagerWindowClasses.h"
 
 class wxArrayString;
+class wxBitmapButton;
 struct TrackListEvent;
 
 // containment hierarchy:

src/ShuttleGui.cpp

@@ -105,6 +105,7 @@ for registering for changes.
 #include <wx/setup.h> // for wxUSE_* macros
 #include <wx/wx.h>
 #include <wx/wxprec.h>
+#include <wx/grid.h>
 #include <wx/listctrl.h>
 #include <wx/notebook.h>
 #include <wx/treectrl.h>

src/ShuttleGui.h

@@ -18,7 +18,6 @@
 
 #include <vector>
 #include "MemoryX.h"
-#include <wx/grid.h>
 
 #include "WrappedType.h"
 

src/Tags.h

@@ -44,7 +44,6 @@
 #include <unordered_map>
 
 class wxArrayString;
-class wxButton;
 class wxComboBox;
 class wxGridCellChoiceEditor;
 class wxRadioButton;

src/Theme.h

@@ -18,13 +18,13 @@
 
 #include <vector>
 #include <wx/bitmap.h>
-#include <wx/colour.h>
 #include <wx/defs.h>
-#include <wx/font.h>
 #include <wx/image.h>
 #include <wx/window.h> // to inherit
 
 class wxArrayString;
+class wxColour;
+class wxFont;
 
 // JKC: will probably change name from 'teBmps' to 'tIndexBmp';
 typedef int teBmps; /// The index of a bitmap resource in Theme Resources.

src/TimerRecordDialog.cpp

@@ -25,6 +25,7 @@
 
 #include <wx/setup.h> // for wxUSE_* macros
 
+#include <wx/button.h>
 #include <wx/choice.h>
 #include <wx/defs.h>
 #include <wx/dir.h>

src/commands/AudacityCommand.h

@@ -17,7 +17,6 @@
 #include <set>
 
 #include "../MemoryX.h"
-#include <wx/bmpbuttn.h>
 #include <wx/defs.h>
 #include <wx/dynarray.h>
 #include <wx/intl.h>

src/commands/ScreenshotCommand.h

@@ -16,7 +16,8 @@
 #include "Command.h"
 #include "../commands/AudacityCommand.h"
 
-#include <wx/colour.h>
+#include <wx/colour.h> // member variable
+
 class wxWindow;
 class wxTopLevelWindow;
 class wxCommandEvent;

src/effects/Effect.cpp

@@ -28,6 +28,7 @@ greater use in future.
 
 #include <algorithm>
 
+#include <wx/bmpbuttn.h>
 #include <wx/checkbox.h>
 #include <wx/choice.h>
 #include <wx/dcmemory.h>

src/effects/Effect.h

@@ -20,11 +20,11 @@
 #include <set>
 
 #include "../MemoryX.h"
-#include <wx/bmpbuttn.h>
 #include <wx/defs.h>
 #include <wx/intl.h>
 #include <wx/tglbtn.h>
 
+class wxButton;
 class wxCheckBox;
 class wxChoice;
 class wxListBox;

src/effects/EffectRack.h

@@ -18,7 +18,6 @@
 
 #if defined(EXPERIMENTAL_EFFECTS_RACK)
 
-#include <wx/bmpbuttn.h>
 #include <wx/defs.h>
 #include <wx/frame.h> // to inherit
 #include <wx/image.h>

src/effects/Equalization.h

@@ -17,7 +17,6 @@
 #define NUM_PTS 180
 #define PANELBORDER 1   // only increase from '1' for testing purposes - MJS
 
-#include <wx/button.h>
 #include <wx/setup.h> // for wxUSE_* macros
 #include <wx/panel.h>
 #include <wx/dialog.h>
@@ -52,6 +51,7 @@ const int kEqOptionCurve   =1<<1;
 const int kEqLegacy = kEqOptionGraphic + kEqOptionCurve;
 
 class wxBoxSizer;
+class wxButton;
 class wxChoice;
 class wxSizer;
 class wxSizerItem;

src/effects/nyquist/Nyquist.cpp

@@ -34,6 +34,7 @@ effects from this one class.
 
 #include <locale.h>
 
+#include <wx/button.h>
 #include <wx/checkbox.h>
 #include <wx/choice.h>
 #include <wx/datetime.h>

src/effects/nyquist/Nyquist.h

@@ -11,7 +11,6 @@
 #ifndef __AUDACITY_EFFECT_NYQUIST__
 #define __AUDACITY_EFFECT_NYQUIST__
 
-#include <wx/button.h>
 #include <wx/datetime.h>
 #include <wx/dialog.h>
 #include <wx/intl.h>

src/prefs/PrefsDialog.h

@@ -13,7 +13,6 @@
 #define __AUDACITY_PREFS_DIALOG__
 
 #include <vector>
-#include <wx/button.h>
 #include <wx/dialog.h>
 #include <wx/treebook.h>
 #include "../widgets/wxPanelWrapper.h"

src/widgets/ASlider.h

@@ -31,7 +31,6 @@ class wxImage;
 class wxSize;
 class wxPoint;
 class wxTextCtrl;
-class wxButton;
 
 class Ruler;
 class TipPanel;

src/widgets/FileHistory.h

@@ -14,13 +14,13 @@
 #include <vector>
 #include <algorithm>
 #include <wx/defs.h>
-#include <wx/grid.h>
 #include <wx/weakref.h>
 
 #include "audacity/Types.h"
 #include "../MemoryX.h"
 
 class wxConfigBase;
+class wxMenu;
 
 class AUDACITY_DLL_API FileHistory
 {

src/widgets/Grid.h

@@ -15,7 +15,7 @@
 #include <vector>
 #include <wx/setup.h> // for wxUSE_* macros
 #include <wx/defs.h>
-#include <wx/grid.h>
+#include <wx/grid.h> // to inherit wxGridCellEditor
 #include "NumericTextCtrl.h"
 #include "../Internat.h"
 

src/widgets/HelpSystem.cpp

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

src/widgets/Ruler.h

@@ -13,7 +13,7 @@
 
 #include "wxPanelWrapper.h"
 
-#include <wx/colour.h>
+#include <wx/colour.h> // member variable
 #include <wx/gdicmn.h>
 #include <wx/pen.h>
 #include <wx/types.h>

src/xml/XMLWriter.h

@@ -11,7 +11,7 @@
 #define __AUDACITY_XML_XML_FILE_WRITER__
 
 #include <vector>
-#include <wx/ffile.h>
+#include <wx/ffile.h> // to inherit
 
 #include "../FileException.h"