Remove or comment wxPanelWrapper.h in headers

src/AboutDialog.h

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

src/FreqWindow.h

@@ -16,7 +16,7 @@
 #include <wx/font.h> // member variable
 #include <wx/statusbr.h> // to inherit
 #include "SampleFormat.h"
-#include "widgets/wxPanelWrapper.h"
+#include "widgets/wxPanelWrapper.h" // to inherit
 
 class wxMemoryDC;
 class wxScrollBar;

src/HistoryWindow.h

@@ -11,7 +11,7 @@
 #ifndef __AUDACITY_HISTORY_WINDOW__
 #define __AUDACITY_HISTORY_WINDOW__
 
-#include "widgets/wxPanelWrapper.h"
+#include "widgets/wxPanelWrapper.h" // to inherit
 
 class wxButton;
 class wxListCtrl;

src/LabelDialog.h

@@ -15,7 +15,7 @@
 #include <wx/defs.h>
 
 #include "Internat.h"
-#include "widgets/wxPanelWrapper.h"
+#include "widgets/wxPanelWrapper.h" // to inherit
 #include "audacity/ComponentInterface.h" // member variable
 
 class wxArrayString;

src/Lyrics.h

@@ -17,7 +17,7 @@
 #include <vector>
 #include <wx/textctrl.h> // to inherit
 #include "commands/CommandManagerWindowClasses.h"
-#include "widgets/wxPanelWrapper.h"
+#include "widgets/wxPanelWrapper.h" // to inherit
 
 class AudacityProject;
 class LabelTrack;

src/MixerBoard.h

@@ -18,7 +18,6 @@
 #include <wx/scrolwin.h> // to inherit
 
 #include "widgets/ASlider.h" // to inherit
-#include "widgets/wxPanelWrapper.h"
 #include "commands/CommandManagerWindowClasses.h"
 
 class wxArrayString;

src/SoundActivatedRecord.h

@@ -16,7 +16,7 @@
 #ifndef __AUDACITY_SOUND_ACTIVATED_RECORD__
 #define __AUDACITY_SOUND_ACTIVATED_RECORD__
 
-#include "widgets/wxPanelWrapper.h"
+#include "widgets/wxPanelWrapper.h" // to inherit
 
 class ShuttleGui;
 

src/SplashDialog.h

@@ -12,7 +12,7 @@
 #define __AUDACITY_SPLASH_DLG__
 
 #include "MemoryX.h"
-#include "widgets/wxPanelWrapper.h"
+#include "widgets/wxPanelWrapper.h" // to inherit
 
 class wxBitmap;
 class ShuttleGui;

src/Tags.h

@@ -36,7 +36,7 @@
 #include "MemoryX.h"
 #include <utility>
 
-#include "widgets/wxPanelWrapper.h"
+#include "widgets/wxPanelWrapper.h" // to inherit
 
 #include <unordered_map>
 

src/TimeDialog.h

@@ -14,7 +14,7 @@
 #include <wx/defs.h>
 
 #include "widgets/NumericTextCtrl.h" // for NumericFormatSymbol
-#include "widgets/wxPanelWrapper.h"
+#include "widgets/wxPanelWrapper.h" // to inherit
 #include "Internat.h"
 
 class NumericTextCtrl;

src/effects/AutoDuck.h

@@ -12,7 +12,6 @@
 #define __AUDACITY_EFFECT_AUTODUCK__
 
 #include "Effect.h"
-#include "../widgets/wxPanelWrapper.h"
 
 class wxBitmap;
 class wxTextCtrl;

src/effects/Compressor.h

@@ -11,8 +11,6 @@
 #ifndef __AUDACITY_EFFECT_COMPRESSOR__
 #define __AUDACITY_EFFECT_COMPRESSOR__
 
-#include "../widgets/wxPanelWrapper.h"
-
 #include "TwoPassSimpleMono.h"
 #include "../SampleFormat.h"
 

src/effects/Contrast.h

@@ -9,7 +9,7 @@
 #ifndef __AUDACITY_CONTRAST_DIALOG__
 #define __AUDACITY_CONTRAST_DIALOG__
 
-#include "../widgets/wxPanelWrapper.h"
+#include "../widgets/wxPanelWrapper.h" // to inherit
 
 class wxButton;
 class wxString;

src/export/Export.h

@@ -15,7 +15,7 @@
 #include <vector>
 #include <wx/filename.h> // member variable
 #include "../SampleFormat.h"
-#include "../widgets/wxPanelWrapper.h"
+#include "../widgets/wxPanelWrapper.h" // to inherit
 
 class wxArrayString;
 class FileDialogWrapper;

src/export/ExportFFmpegDialogs.h

@@ -19,7 +19,6 @@ LRN
 
 #include "../xml/XMLFileReader.h"
 #include "../FileNames.h"
-#include "../widgets/wxPanelWrapper.h"
 
 #include <unordered_map>
 

src/import/Import.h

@@ -17,7 +17,7 @@
 #include <vector>
 #include <wx/tokenzr.h> // for enum wxStringTokenizerMode
 
-#include "../widgets/wxPanelWrapper.h"
+#include "../widgets/wxPanelWrapper.h" // to inherit
 
 class wxArrayString;
 class wxListBox;

src/prefs/PrefsDialog.h

@@ -13,7 +13,7 @@
 #define __AUDACITY_PREFS_DIALOG__
 
 #include <vector>
-#include "../widgets/wxPanelWrapper.h"
+#include "../widgets/wxPanelWrapper.h" // to inherit
 #include "../Internat.h"
 
 class wxTreebook;

src/prefs/PrefsPanel.h

@@ -33,7 +33,7 @@ PrefsPanel.
 #ifndef __AUDACITY_PREFS_PANEL__
 #define __AUDACITY_PREFS_PANEL__
 
-#include "../widgets/wxPanelWrapper.h"
+#include "../widgets/wxPanelWrapper.h" // to inherit
 
 /* A few constants for an attempt at semi-uniformity */
 #define PREFS_FONT_SIZE     8

src/toolbars/ToolBar.h

@@ -19,7 +19,7 @@
 #include <wx/defs.h>
 
 #include "../Theme.h"
-#include "../widgets/wxPanelWrapper.h"
+#include "../widgets/wxPanelWrapper.h" // to inherit
 
 class wxBoxSizer;
 class wxDC;

src/widgets/AButton.h

@@ -16,6 +16,7 @@
 #include <vector>
 
 #include <wx/setup.h> // for wxUSE_* macros
+#include <wx/window.h> // to inherit
 
 #include "ImageRoll.h"
 

src/widgets/ASlider.h

@@ -17,7 +17,7 @@
 #include <wx/setup.h> // for wxUSE_* macros
 #include <wx/defs.h>
 #include <wx/timer.h> // member variable
-#include "wxPanelWrapper.h"
+#include "wxPanelWrapper.h" // to inherit
 
 class wxArrayString;
 class wxBitmap;

src/widgets/BackedPanel.h

@@ -11,7 +11,7 @@
 
 #include "../MemoryX.h"
 #include <wx/dcmemory.h> // member variable
-#include "wxPanelWrapper.h"
+#include "wxPanelWrapper.h" // to inherit
 
 
 /// \brief BackedPanel is for a panel that consists of a bitmap with something drawn

src/widgets/ErrorDialog.h

@@ -16,7 +16,7 @@
 
 #include <wx/defs.h>
 #include <wx/msgdlg.h> // to inherit
-#include "wxPanelWrapper.h"
+#include "wxPanelWrapper.h" // to inherit
 
 class AudacityProject;
 

src/widgets/ExpandingToolBar.h

@@ -19,7 +19,7 @@
 #include <wx/minifram.h> // to inherit
 
 #include "ImageRoll.h"
-#include "wxPanelWrapper.h"
+#include "wxPanelWrapper.h" // to inherit
 
 #include <unordered_map>
 

src/widgets/HelpSystem.h

@@ -15,7 +15,7 @@
 #include "../Audacity.h"
 
 #include <wx/defs.h>
-#include "wxPanelWrapper.h"
+#include "wxPanelWrapper.h" // to inherit
 
 class AudacityProject;
 

src/widgets/ImageRoll.h

@@ -15,7 +15,7 @@
 #include <vector>
 #include <wx/dc.h> // for enum wxRasterOperationMode
 #include <wx/defs.h>
-#include "wxPanelWrapper.h"
+#include "wxPanelWrapper.h" // to inherit
 
 #if !wxCHECK_VERSION(3,0,0)
 #define wxRasterOperationMode int

src/widgets/LinkingHtmlWindow.h

@@ -17,7 +17,7 @@
 #define __AUDACITY_LINKINGHTMLWINDOW__
 
 #include "HtmlWindow.h" // to inherit
-#include "wxPanelWrapper.h"
+#include "wxPanelWrapper.h" // to inherit
 
 void OpenInDefaultBrowser(const wxHtmlLinkInfo& link);
 

src/widgets/ProgressDialog.h

@@ -25,7 +25,7 @@
 #include <wx/defs.h>
 #include <wx/evtloop.h> // member variable
 
-#include "wxPanelWrapper.h"
+#include "wxPanelWrapper.h" // to inherit
 
 class wxGauge;
 class wxStaticText;

src/widgets/Ruler.h

@@ -11,7 +11,7 @@
 #ifndef __AUDACITY_RULER__
 #define __AUDACITY_RULER__
 
-#include "wxPanelWrapper.h"
+#include "wxPanelWrapper.h" // to inherit
 
 #include <wx/colour.h> // member variable
 #include <wx/pen.h> // member variable