Remove wx/intl.h, wx/brush.h, wx/bitmap.h from headers

include/audacity/EffectAutomationParameters.h

@@ -47,7 +47,6 @@
 
 #include <wx/cmdline.h>
 #include <wx/fileconf.h> // to inherit
-#include <wx/intl.h>
 #include <algorithm>
 
 #include "ComponentInterface.h"

src/AColor.h

@@ -15,7 +15,7 @@
 #define __AUDACITY_COLOR__
 
 #include "MemoryX.h"
-#include <wx/brush.h>
+#include <wx/brush.h> // member variable
 #include <wx/pen.h> // member variable
 
 class wxDC;

src/AboutDialog.h

@@ -13,7 +13,6 @@
 
 #include "MemoryX.h"
 #include <vector>
-#include <wx/bitmap.h>
 #include "widgets/wxPanelWrapper.h"
 
 extern const wxString VerCheckArgs();

src/AdornedRulerPanel.h

@@ -15,7 +15,6 @@
 #include "widgets/Ruler.h"
 
 #include "MemoryX.h"
-#include <wx/bitmap.h>
 
 class ViewInfo;
 class AudacityProject;

src/AudacityApp.h

@@ -24,7 +24,6 @@
 #include <wx/cmdline.h>
 #include <wx/dir.h>
 #include <wx/docview.h>
-#include <wx/intl.h>
 #include <wx/snglinst.h>
 #include <wx/socket.h>
 #include <wx/timer.h>

src/Envelope.h

@@ -15,8 +15,6 @@
 #include <algorithm>
 #include <vector>
 
-#include <wx/brush.h>
-
 #include "xml/XMLTagHandler.h"
 #include "Internat.h"
 

src/FreqWindow.h

@@ -13,7 +13,6 @@
 
 #include "MemoryX.h"
 #include <vector>
-#include <wx/brush.h>
 #include <wx/panel.h>
 #include <wx/dialog.h>
 #include <wx/gdicmn.h>

src/LabelTrack.h

@@ -16,7 +16,6 @@
 #include "SelectedRegion.h"
 #include "Track.h"
 
-#include <wx/brush.h>
 #include <wx/clipbrd.h>
 
 

src/Project.h

@@ -41,7 +41,6 @@ class wxMemoryDC;
 #include <wx/generic/dragimgg.h>
 
 #include <wx/frame.h> // to inherit
-#include <wx/intl.h>
 
 #include "import/ImportRaw.h" // defines TrackHolders
 

src/Resample.h

@@ -15,7 +15,6 @@
 #include "Audacity.h"
 
 #include "MemoryX.h"
-#include <wx/intl.h>
 
 #include "SampleFormat.h"
 

src/Theme.h

@@ -17,11 +17,11 @@
 #include "Audacity.h"
 
 #include <vector>
-#include <wx/bitmap.h>
 #include <wx/defs.h>
 #include <wx/window.h> // to inherit
 
 class wxArrayString;
+class wxBitmap;
 class wxColour;
 class wxFont;
 class wxImage;

src/TimeTrack.h

@@ -12,7 +12,6 @@
 #define __AUDACITY_TIMETRACK__
 
 #include "Track.h"
-#include <wx/brush.h>
 
 #include <algorithm>
 

src/TrackArtist.h

@@ -22,7 +22,7 @@
 #include "Experimental.h"
 
 #include "MemoryX.h"
-#include <wx/brush.h>
+#include <wx/brush.h> // member variable
 #include <wx/pen.h> // member variables
 #include "audacity/Types.h"
 

src/commands/AudacityCommand.h

@@ -19,7 +19,6 @@
 #include "../MemoryX.h"
 #include <wx/defs.h>
 #include <wx/dynarray.h>
-#include <wx/intl.h>
 
 class wxListBox;
 class wxWindow;

src/effects/AutoDuck.h

@@ -11,12 +11,12 @@
 #ifndef __AUDACITY_EFFECT_AUTODUCK__
 #define __AUDACITY_EFFECT_AUTODUCK__
 
-#include <wx/bitmap.h>
 #include <wx/gdicmn.h>
 
 #include "Effect.h"
 #include "../widgets/wxPanelWrapper.h"
 
+class wxBitmap;
 class wxTextCtrl;
 class EffectAutoDuckPanel;
 class ShuttleGui;

src/effects/Compressor.h

@@ -11,7 +11,6 @@
 #ifndef __AUDACITY_EFFECT_COMPRESSOR__
 #define __AUDACITY_EFFECT_COMPRESSOR__
 
-#include <wx/bitmap.h>
 #include <wx/gdicmn.h>
 #include "../widgets/wxPanelWrapper.h"
 

src/effects/Effect.h

@@ -21,7 +21,6 @@
 
 #include "../MemoryX.h"
 #include <wx/defs.h>
-#include <wx/intl.h>
 
 class wxButton;
 class wxCheckBox;

src/effects/Equalization.h

@@ -20,8 +20,6 @@
 #include <wx/setup.h> // for wxUSE_* macros
 #include <wx/panel.h>
 #include <wx/dialog.h>
-#include <wx/intl.h>
-#include <wx/bitmap.h>
 #include <wx/radiobut.h>
 
 #if wxUSE_ACCESSIBILITY
@@ -48,6 +46,7 @@ const int kEqOptionCurve   =1<<1;
 // The legacy version offers both Graphic and curve on the same UI.
 const int kEqLegacy = kEqOptionGraphic + kEqOptionCurve;
 
+class wxBitmap;
 class wxBoxSizer;
 class wxButton;
 class wxCheckBox;

src/effects/ScienFilter.h

@@ -15,13 +15,13 @@ Vaughan Johnson (Preview)
 
 #include <wx/setup.h> // for wxUSE_* macros
 
-#include <wx/bitmap.h>
 #include <wx/panel.h>
 
 #include "Biquad.h"
 
 #include "Effect.h"
 
+class wxBitmap;
 class wxChoice;
 class wxSlider;
 class wxStaticText;

src/effects/nyquist/Nyquist.h

@@ -13,7 +13,6 @@
 
 #include <wx/datetime.h>
 #include <wx/dialog.h>
-#include <wx/intl.h>
 #include <wx/textbuf.h>
 
 #include "../Effect.h"

src/toolbars/SelectionBar.h

@@ -26,7 +26,6 @@
 
 #define SIZER_COLS 7
 
-class wxBitmap;
 class wxChoice;
 class wxComboBox;
 class wxCommandEvent;

src/toolbars/SpectralSelectionBar.h

@@ -16,7 +16,6 @@ Paul Licameli
 #include "ToolBar.h"
 #include "../widgets/NumericTextCtrl.h"
 
-class wxBitmap;
 class wxChoice;
 class wxComboBox;
 class wxCommandEvent;

src/toolbars/ToolManager.h

@@ -22,7 +22,6 @@
 #include "ToolDock.h"
 #include "ToolBar.h"
 
-class wxBitmap;
 class wxCommandEvent;
 class wxFrame;
 class wxMouseEvent;

src/toolbars/TranscriptionToolBar.cpp

@@ -107,8 +107,6 @@ void TranscriptionToolBar::Create(wxWindow * parent)
 {
    ToolBar::Create(parent);
 
-   mBackgroundBrush.SetColour(wxColour(204, 204, 204));
-
    mBackgroundHeight = 0;
    mBackgroundWidth = 0;
 

src/toolbars/TranscriptionToolBar.h

@@ -18,13 +18,11 @@
 #include "ToolBar.h"
 
 #include "../MemoryX.h"
-#include <wx/brush.h>
+#include <wx/brush.h> // member variable
 
 #include "audacity/Types.h"
 #include "../Theme.h"
 
-class wxBitmap;
-class wxBrush;
 class wxChoice;
 class wxCommandEvent;
 class wxImage;
@@ -150,7 +148,6 @@ class TranscriptionToolBar final : public ToolBar {
    wxChoice *mKeyTypeChoice;
 #endif
 
-   wxBrush mBackgroundBrush;
    int mBackgroundWidth;
    int mBackgroundHeight;
 

src/widgets/Meter.h

@@ -17,7 +17,7 @@
 #define __AUDACITY_METER__
 
 #include <wx/setup.h> // for wxUSE_* macros
-#include <wx/brush.h>
+#include <wx/brush.h> // member variable
 #include <wx/defs.h>
 #include <wx/gdicmn.h>
 #include <wx/timer.h>