From 2e1fe80601a24e749fd83526bb05d1fbdb4ec582 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Sat, 30 Mar 2019 15:06:57 -0400 Subject: [PATCH] Remove or comment wxPanelWrapper.h in headers --- src/AboutDialog.h | 2 +- src/FreqWindow.h | 2 +- src/HistoryWindow.h | 2 +- src/LabelDialog.h | 2 +- src/Lyrics.h | 2 +- src/MixerBoard.h | 1 - src/SoundActivatedRecord.h | 2 +- src/SplashDialog.h | 2 +- src/Tags.h | 2 +- src/TimeDialog.h | 2 +- src/effects/AutoDuck.h | 1 - src/effects/Compressor.h | 2 -- src/effects/Contrast.h | 2 +- src/export/Export.h | 2 +- src/export/ExportFFmpegDialogs.h | 1 - src/import/Import.h | 2 +- src/prefs/PrefsDialog.h | 2 +- src/prefs/PrefsPanel.h | 2 +- src/toolbars/ToolBar.h | 2 +- src/widgets/AButton.h | 1 + src/widgets/ASlider.h | 2 +- src/widgets/BackedPanel.h | 2 +- src/widgets/ErrorDialog.h | 2 +- src/widgets/ExpandingToolBar.h | 2 +- src/widgets/HelpSystem.h | 2 +- src/widgets/ImageRoll.h | 2 +- src/widgets/LinkingHtmlWindow.h | 2 +- src/widgets/ProgressDialog.h | 2 +- src/widgets/Ruler.h | 2 +- 29 files changed, 25 insertions(+), 29 deletions(-) diff --git a/src/AboutDialog.h b/src/AboutDialog.h index ce2ec3b71..8c481a872 100644 --- a/src/AboutDialog.h +++ b/src/AboutDialog.h @@ -13,7 +13,7 @@ #include "MemoryX.h" #include -#include "widgets/wxPanelWrapper.h" +#include "widgets/wxPanelWrapper.h" // to inherit extern const wxString VerCheckArgs(); extern const wxString VerCheckUrl(); diff --git a/src/FreqWindow.h b/src/FreqWindow.h index e3868b307..0ec316f9b 100644 --- a/src/FreqWindow.h +++ b/src/FreqWindow.h @@ -16,7 +16,7 @@ #include // member variable #include // to inherit #include "SampleFormat.h" -#include "widgets/wxPanelWrapper.h" +#include "widgets/wxPanelWrapper.h" // to inherit class wxMemoryDC; class wxScrollBar; diff --git a/src/HistoryWindow.h b/src/HistoryWindow.h index 36257dd2c..6aba7b3d5 100644 --- a/src/HistoryWindow.h +++ b/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; diff --git a/src/LabelDialog.h b/src/LabelDialog.h index 23924ba8f..8a3d3df62 100644 --- a/src/LabelDialog.h +++ b/src/LabelDialog.h @@ -15,7 +15,7 @@ #include #include "Internat.h" -#include "widgets/wxPanelWrapper.h" +#include "widgets/wxPanelWrapper.h" // to inherit #include "audacity/ComponentInterface.h" // member variable class wxArrayString; diff --git a/src/Lyrics.h b/src/Lyrics.h index 33aa8e2fe..7e3dd48f2 100644 --- a/src/Lyrics.h +++ b/src/Lyrics.h @@ -17,7 +17,7 @@ #include #include // to inherit #include "commands/CommandManagerWindowClasses.h" -#include "widgets/wxPanelWrapper.h" +#include "widgets/wxPanelWrapper.h" // to inherit class AudacityProject; class LabelTrack; diff --git a/src/MixerBoard.h b/src/MixerBoard.h index 0e1c98a67..3f10396b3 100644 --- a/src/MixerBoard.h +++ b/src/MixerBoard.h @@ -18,7 +18,6 @@ #include // to inherit #include "widgets/ASlider.h" // to inherit -#include "widgets/wxPanelWrapper.h" #include "commands/CommandManagerWindowClasses.h" class wxArrayString; diff --git a/src/SoundActivatedRecord.h b/src/SoundActivatedRecord.h index 366fca4a5..164fb9e4e 100644 --- a/src/SoundActivatedRecord.h +++ b/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; diff --git a/src/SplashDialog.h b/src/SplashDialog.h index 6c134343a..5e9454868 100644 --- a/src/SplashDialog.h +++ b/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; diff --git a/src/Tags.h b/src/Tags.h index 46bf56e46..919d0a698 100644 --- a/src/Tags.h +++ b/src/Tags.h @@ -36,7 +36,7 @@ #include "MemoryX.h" #include -#include "widgets/wxPanelWrapper.h" +#include "widgets/wxPanelWrapper.h" // to inherit #include diff --git a/src/TimeDialog.h b/src/TimeDialog.h index 092222290..f59ffed05 100644 --- a/src/TimeDialog.h +++ b/src/TimeDialog.h @@ -14,7 +14,7 @@ #include #include "widgets/NumericTextCtrl.h" // for NumericFormatSymbol -#include "widgets/wxPanelWrapper.h" +#include "widgets/wxPanelWrapper.h" // to inherit #include "Internat.h" class NumericTextCtrl; diff --git a/src/effects/AutoDuck.h b/src/effects/AutoDuck.h index ebf866b98..566707c7b 100644 --- a/src/effects/AutoDuck.h +++ b/src/effects/AutoDuck.h @@ -12,7 +12,6 @@ #define __AUDACITY_EFFECT_AUTODUCK__ #include "Effect.h" -#include "../widgets/wxPanelWrapper.h" class wxBitmap; class wxTextCtrl; diff --git a/src/effects/Compressor.h b/src/effects/Compressor.h index 63a8619c5..8d1772ae9 100644 --- a/src/effects/Compressor.h +++ b/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" diff --git a/src/effects/Contrast.h b/src/effects/Contrast.h index ed1c81aba..204cbb183 100644 --- a/src/effects/Contrast.h +++ b/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; diff --git a/src/export/Export.h b/src/export/Export.h index 36026aea1..055e33cd1 100644 --- a/src/export/Export.h +++ b/src/export/Export.h @@ -15,7 +15,7 @@ #include #include // member variable #include "../SampleFormat.h" -#include "../widgets/wxPanelWrapper.h" +#include "../widgets/wxPanelWrapper.h" // to inherit class wxArrayString; class FileDialogWrapper; diff --git a/src/export/ExportFFmpegDialogs.h b/src/export/ExportFFmpegDialogs.h index 86f5d2679..e1558cb51 100644 --- a/src/export/ExportFFmpegDialogs.h +++ b/src/export/ExportFFmpegDialogs.h @@ -19,7 +19,6 @@ LRN #include "../xml/XMLFileReader.h" #include "../FileNames.h" -#include "../widgets/wxPanelWrapper.h" #include diff --git a/src/import/Import.h b/src/import/Import.h index 9f3c18ed8..5222f407f 100644 --- a/src/import/Import.h +++ b/src/import/Import.h @@ -17,7 +17,7 @@ #include #include // for enum wxStringTokenizerMode -#include "../widgets/wxPanelWrapper.h" +#include "../widgets/wxPanelWrapper.h" // to inherit class wxArrayString; class wxListBox; diff --git a/src/prefs/PrefsDialog.h b/src/prefs/PrefsDialog.h index ddb09471e..49942c193 100644 --- a/src/prefs/PrefsDialog.h +++ b/src/prefs/PrefsDialog.h @@ -13,7 +13,7 @@ #define __AUDACITY_PREFS_DIALOG__ #include -#include "../widgets/wxPanelWrapper.h" +#include "../widgets/wxPanelWrapper.h" // to inherit #include "../Internat.h" class wxTreebook; diff --git a/src/prefs/PrefsPanel.h b/src/prefs/PrefsPanel.h index a407c4eed..ceb2cee64 100644 --- a/src/prefs/PrefsPanel.h +++ b/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 diff --git a/src/toolbars/ToolBar.h b/src/toolbars/ToolBar.h index 3833a750d..f8b7999e5 100644 --- a/src/toolbars/ToolBar.h +++ b/src/toolbars/ToolBar.h @@ -19,7 +19,7 @@ #include #include "../Theme.h" -#include "../widgets/wxPanelWrapper.h" +#include "../widgets/wxPanelWrapper.h" // to inherit class wxBoxSizer; class wxDC; diff --git a/src/widgets/AButton.h b/src/widgets/AButton.h index 77c44ea1e..28731ca2b 100644 --- a/src/widgets/AButton.h +++ b/src/widgets/AButton.h @@ -16,6 +16,7 @@ #include #include // for wxUSE_* macros +#include // to inherit #include "ImageRoll.h" diff --git a/src/widgets/ASlider.h b/src/widgets/ASlider.h index 841a8991f..30030c5a1 100644 --- a/src/widgets/ASlider.h +++ b/src/widgets/ASlider.h @@ -17,7 +17,7 @@ #include // for wxUSE_* macros #include #include // member variable -#include "wxPanelWrapper.h" +#include "wxPanelWrapper.h" // to inherit class wxArrayString; class wxBitmap; diff --git a/src/widgets/BackedPanel.h b/src/widgets/BackedPanel.h index f945da6ca..bdfc0419d 100644 --- a/src/widgets/BackedPanel.h +++ b/src/widgets/BackedPanel.h @@ -11,7 +11,7 @@ #include "../MemoryX.h" #include // member variable -#include "wxPanelWrapper.h" +#include "wxPanelWrapper.h" // to inherit /// \brief BackedPanel is for a panel that consists of a bitmap with something drawn diff --git a/src/widgets/ErrorDialog.h b/src/widgets/ErrorDialog.h index 7d554e7e7..41724c3ce 100644 --- a/src/widgets/ErrorDialog.h +++ b/src/widgets/ErrorDialog.h @@ -16,7 +16,7 @@ #include #include // to inherit -#include "wxPanelWrapper.h" +#include "wxPanelWrapper.h" // to inherit class AudacityProject; diff --git a/src/widgets/ExpandingToolBar.h b/src/widgets/ExpandingToolBar.h index d4cc17686..92fe4f367 100644 --- a/src/widgets/ExpandingToolBar.h +++ b/src/widgets/ExpandingToolBar.h @@ -19,7 +19,7 @@ #include // to inherit #include "ImageRoll.h" -#include "wxPanelWrapper.h" +#include "wxPanelWrapper.h" // to inherit #include diff --git a/src/widgets/HelpSystem.h b/src/widgets/HelpSystem.h index b82b89489..7dd598293 100644 --- a/src/widgets/HelpSystem.h +++ b/src/widgets/HelpSystem.h @@ -15,7 +15,7 @@ #include "../Audacity.h" #include -#include "wxPanelWrapper.h" +#include "wxPanelWrapper.h" // to inherit class AudacityProject; diff --git a/src/widgets/ImageRoll.h b/src/widgets/ImageRoll.h index 841ae4c59..943b9bfda 100644 --- a/src/widgets/ImageRoll.h +++ b/src/widgets/ImageRoll.h @@ -15,7 +15,7 @@ #include #include // for enum wxRasterOperationMode #include -#include "wxPanelWrapper.h" +#include "wxPanelWrapper.h" // to inherit #if !wxCHECK_VERSION(3,0,0) #define wxRasterOperationMode int diff --git a/src/widgets/LinkingHtmlWindow.h b/src/widgets/LinkingHtmlWindow.h index ec5002e1d..3e7be3b8e 100644 --- a/src/widgets/LinkingHtmlWindow.h +++ b/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); diff --git a/src/widgets/ProgressDialog.h b/src/widgets/ProgressDialog.h index 243c113d0..e2fcb946f 100644 --- a/src/widgets/ProgressDialog.h +++ b/src/widgets/ProgressDialog.h @@ -25,7 +25,7 @@ #include #include // member variable -#include "wxPanelWrapper.h" +#include "wxPanelWrapper.h" // to inherit class wxGauge; class wxStaticText; diff --git a/src/widgets/Ruler.h b/src/widgets/Ruler.h index 17b3c9f5c..301c98349 100644 --- a/src/widgets/Ruler.h +++ b/src/widgets/Ruler.h @@ -11,7 +11,7 @@ #ifndef __AUDACITY_RULER__ #define __AUDACITY_RULER__ -#include "wxPanelWrapper.h" +#include "wxPanelWrapper.h" // to inherit #include // member variable #include // member variable