Remove wx/pen.h, wx/thread.h from headers

src/AColor.h

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

src/AudioIO.h

@@ -49,7 +49,6 @@ using NoteTrackConstArray = std::vector < std::shared_ptr< const NoteTrack > >;
 #endif
 
 #include <wx/event.h> // to declare custom event types
-#include <wx/thread.h>
 
 #include "SampleFormat.h"
 

src/Envelope.h

@@ -16,7 +16,6 @@
 #include <vector>
 
 #include <wx/brush.h>
-#include <wx/pen.h>
 
 #include "xml/XMLTagHandler.h"
 #include "Internat.h"

src/FreqWindow.h

@@ -17,7 +17,6 @@
 #include <wx/panel.h>
 #include <wx/dialog.h>
 #include <wx/gdicmn.h>
-#include <wx/pen.h>
 #include <wx/font.h> // member variable
 #include <wx/statusbr.h> // to inherit
 #include <wx/utils.h>

src/LabelTrack.h

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

src/Theme.h

@@ -25,6 +25,7 @@
 class wxArrayString;
 class wxColour;
 class wxFont;
+class wxPen;
 
 // JKC: will probably change name from 'teBmps' to 'tIndexBmp';
 typedef int teBmps; /// The index of a bitmap resource in Theme Resources.

src/TimeTrack.h

@@ -13,7 +13,6 @@
 
 #include "Track.h"
 #include <wx/brush.h>
-#include <wx/pen.h>
 
 #include <algorithm>
 

src/TrackArtist.h

@@ -23,7 +23,7 @@
 
 #include "MemoryX.h"
 #include <wx/brush.h>
-#include <wx/pen.h>
+#include <wx/pen.h> // member variables
 #include "audacity/Types.h"
 
 class wxRect;

src/WaveTrack.h

@@ -18,7 +18,6 @@
 #include <vector>
 #include <wx/gdicmn.h>
 #include <wx/longlong.h>
-#include <wx/thread.h>
 
 #include "WaveTrackLocation.h"
 

src/blockfile/ODDecodeBlockFile.h

@@ -33,7 +33,6 @@ Also, see ODPCMAliasBlockFile for a similar file.
 #include "../DirManager.h"
 #include "../ondemand/ODDecodeTask.h"
 #include <wx/atomic.h>
-#include <wx/thread.h>
 
 /// An AliasBlockFile that references uncompressed data in an existing file
 class ODDecodeBlockFile final : public SimpleBlockFile

src/blockfile/ODPCMAliasBlockFile.h

@@ -40,7 +40,6 @@ Some of these methods have been overridden only because they used the unsafe wxL
 #include "../BlockFile.h"
 #include "../ondemand/ODTaskThread.h"
 #include "../DirManager.h"
-#include <wx/thread.h>
 
 /// An AliasBlockFile that references uncompressed data in an existing file
 class ODPCMAliasBlockFile final : public PCMAliasBlockFile

src/commands/ResponseQueue.h

@@ -36,7 +36,7 @@ force the script thread to wait until a response is available.
 
 #include <queue>
 #include <string>
-#include <wx/thread.h>
+#include <wx/thread.h> // member variable
 #include <wx/string.h> // member variable
 
 class wxMutex;

src/ondemand/ODManager.h

@@ -22,7 +22,6 @@ number of threads.
 #include <vector>
 #include "ODTaskThread.h"
 #include <wx/event.h> // for DECLARE_EXPORTED_EVENT_TYPE
-#include <wx/thread.h>
 
 #ifdef __WXMAC__
 // On Mac OS X, it's better not to use the wxThread class.

src/ondemand/ODTaskThread.h

@@ -24,7 +24,7 @@
 
 #include "../Audacity.h"	// contains the set-up of AUDACITY_DLL_API
 
-#include <wx/thread.h>
+#include <wx/thread.h> // to inherit
 
 #include "../MemoryX.h"
 

src/toolbars/TranscriptionToolBar.cpp

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

src/toolbars/TranscriptionToolBar.h

@@ -19,7 +19,6 @@
 
 #include "../MemoryX.h"
 #include <wx/brush.h>
-#include <wx/pen.h>
 
 #include "audacity/Types.h"
 #include "../Theme.h"
@@ -30,7 +29,6 @@ class wxChoice;
 class wxCommandEvent;
 class wxImage;
 class wxKeyEvent;
-class wxPen;
 
 class AButton;
 class ASlider;
@@ -153,7 +151,6 @@ class TranscriptionToolBar final : public ToolBar {
 #endif
 
    wxBrush mBackgroundBrush;
-   wxPen mBackgroundPen;
    int mBackgroundWidth;
    int mBackgroundHeight;
 

src/widgets/Ruler.h

@@ -15,7 +15,7 @@
 
 #include <wx/colour.h> // member variable
 #include <wx/gdicmn.h>
-#include <wx/pen.h>
+#include <wx/pen.h> // member variable
 #include <wx/types.h>
 
 class wxArrayString;