diff --git a/lib-src/mod-nyq-bench/NyqBench.cpp b/lib-src/mod-nyq-bench/NyqBench.cpp index c10408eaa..fd242b628 100755 --- a/lib-src/mod-nyq-bench/NyqBench.cpp +++ b/lib-src/mod-nyq-bench/NyqBench.cpp @@ -34,7 +34,7 @@ #include "effects/nyquist/Nyquist.h" #include "../images/AudacityLogo.xpm" #include "../../src/commands/CommandContext.h" -#include "widgets/ErrorDialog.h" +#include "widgets/AudacityMessageBox.h" #include "NyqBench.h" diff --git a/locale/POTFILES.in b/locale/POTFILES.in index 43f4924c7..cd38332bd 100644 --- a/locale/POTFILES.in +++ b/locale/POTFILES.in @@ -701,6 +701,8 @@ src/widgets/ASlider.cpp src/widgets/ASlider.h src/widgets/AttachableScrollBar.cpp src/widgets/AttachableScrollBar.h +src/widgets/AudacityMessageBox.cpp +src/widgets/AudacityMessageBox.h src/widgets/BackedPanel.cpp src/widgets/BackedPanel.h src/widgets/ErrorDialog.cpp diff --git a/mac/Audacity.xcodeproj/project.pbxproj b/mac/Audacity.xcodeproj/project.pbxproj index 7b048ebcd..70c85c39b 100644 --- a/mac/Audacity.xcodeproj/project.pbxproj +++ b/mac/Audacity.xcodeproj/project.pbxproj @@ -1223,6 +1223,7 @@ 5E15126F1DB0010C00702E29 /* TrackUI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E15126A1DB0010C00702E29 /* TrackUI.cpp */; }; 5E1512701DB0010C00702E29 /* TrackVRulerControls.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E15126B1DB0010C00702E29 /* TrackVRulerControls.cpp */; }; 5E16FF4D1FF9CE0B0085E1B8 /* LanguageNames.txt in Resources */ = {isa = PBXBuildFile; fileRef = 5E16FF4C1FF9CE0B0085E1B8 /* LanguageNames.txt */; }; + 5E18CFF322931D3D00E75250 /* AudacityMessageBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E18CFF222931D3D00E75250 /* AudacityMessageBox.cpp */; }; 5E19D655217D51190024D0B1 /* PluginMenus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E19D64C217D51190024D0B1 /* PluginMenus.cpp */; }; 5E2A19941EED688500217B58 /* SelectionState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E2A19921EED688500217B58 /* SelectionState.cpp */; }; 5E36A0A8217FA2430068E082 /* EditMenus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E36A09F217FA2430068E082 /* EditMenus.cpp */; }; @@ -3195,6 +3196,8 @@ 5E15126B1DB0010C00702E29 /* TrackVRulerControls.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TrackVRulerControls.cpp; sourceTree = ""; }; 5E15126C1DB0010C00702E29 /* TrackVRulerControls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TrackVRulerControls.h; sourceTree = ""; }; 5E16FF4C1FF9CE0B0085E1B8 /* LanguageNames.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = LanguageNames.txt; path = ../locale/LanguageNames.txt; sourceTree = ""; }; + 5E18CFF122931CA900E75250 /* AudacityMessageBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudacityMessageBox.h; sourceTree = ""; }; + 5E18CFF222931D3D00E75250 /* AudacityMessageBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AudacityMessageBox.cpp; sourceTree = ""; }; 5E19D64C217D51190024D0B1 /* PluginMenus.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PluginMenus.cpp; path = menus/PluginMenus.cpp; sourceTree = ""; }; 5E2A19921EED688500217B58 /* SelectionState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SelectionState.cpp; sourceTree = ""; }; 5E2A19931EED688500217B58 /* SelectionState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelectionState.h; sourceTree = ""; }; @@ -4828,6 +4831,8 @@ 1790B10109883BFD008A330A /* ASlider.h */, 28F1D8170A2D0018005506A7 /* AttachableScrollBar.cpp */, 28F1D8180A2D0018005506A7 /* AttachableScrollBar.h */, + 5E18CFF122931CA900E75250 /* AudacityMessageBox.h */, + 5E18CFF222931D3D00E75250 /* AudacityMessageBox.cpp */, 5ED1D0AF1CDE560C00471E3C /* BackedPanel.cpp */, 5ED1D0B01CDE560C00471E3C /* BackedPanel.h */, 283AA0E90C56ED08002CBD34 /* ErrorDialog.cpp */, @@ -8472,6 +8477,7 @@ 5E36A0AB217FA2430068E082 /* NavigationMenus.cpp in Sources */, 28D587CB0E264CF4009C7DEA /* LoadLV2.cpp in Sources */, 5E02BFF21D1164DF00EB7578 /* Distortion.cpp in Sources */, + 5E18CFF322931D3D00E75250 /* AudacityMessageBox.cpp in Sources */, 28D587CC0E264CF4009C7DEA /* LV2Effect.cpp in Sources */, 28DA07390E4F5CEC003933C5 /* ExportFFmpegDialogs.cpp in Sources */, 186CCE6D0E51F47400659159 /* ODDecodeBlockFile.cpp in Sources */, diff --git a/src/AudacityApp.cpp b/src/AudacityApp.cpp index 5448449e0..eab26b7be 100644 --- a/src/AudacityApp.cpp +++ b/src/AudacityApp.cpp @@ -96,7 +96,7 @@ It handles initialization and termination by subclassing wxApp. #include "FFT.h" #include "BlockFile.h" #include "ondemand/ODManager.h" -#include "widgets/ErrorDialog.h" +#include "widgets/AudacityMessageBox.h" #include "prefs/DirectoriesPrefs.h" #include "prefs/GUIPrefs.h" #include "tracks/ui/Scrubbing.h" diff --git a/src/AudacityException.cpp b/src/AudacityException.cpp index a229349a5..310646fbb 100644 --- a/src/AudacityException.cpp +++ b/src/AudacityException.cpp @@ -24,7 +24,7 @@ got to show. #include -#include "widgets/ErrorDialog.h" +#include "widgets/AudacityMessageBox.h" AudacityException::~AudacityException() { diff --git a/src/AudacityLogger.cpp b/src/AudacityLogger.cpp index 2da109ba3..54219e2b6 100644 --- a/src/AudacityLogger.cpp +++ b/src/AudacityLogger.cpp @@ -20,6 +20,7 @@ Provides thread-safe logging based on the wxWidgets log facility. #include "Experimental.h" #include "FileNames.h" +#include "Internat.h" #include "ShuttleGui.h" #include @@ -28,9 +29,10 @@ Provides thread-safe logging based on the wxWidgets log facility. #include #include #include +#include #include "../images/AudacityLogoAlpha.xpm" -#include "widgets/ErrorDialog.h" +#include "widgets/AudacityMessageBox.h" // // AudacityLogger class diff --git a/src/AudioIO.cpp b/src/AudioIO.cpp index 92eaac3f6..aa3e73916 100644 --- a/src/AudioIO.cpp +++ b/src/AudioIO.cpp @@ -464,6 +464,7 @@ TimeTrack and AudioIOListener and whether the playback is looped. #include "prefs/RecordingPrefs.h" #include "toolbars/ControlToolBar.h" #include "widgets/Meter.h" +#include "widgets/AudacityMessageBox.h" #include "widgets/ErrorDialog.h" #include "widgets/Warning.h" diff --git a/src/AutoRecovery.cpp b/src/AutoRecovery.cpp index f999fe420..a5e92af1b 100644 --- a/src/AutoRecovery.cpp +++ b/src/AutoRecovery.cpp @@ -37,7 +37,8 @@ text or binary format to a file. #include "WaveClip.h" #include "WaveTrack.h" -#include "widgets/ErrorDialog.h" +#include "widgets/AudacityMessageBox.h" +#include "widgets/wxPanelWrapper.h" enum { ID_RECOVER_ALL = 10000, diff --git a/src/BatchCommands.cpp b/src/BatchCommands.cpp index 8733d79e0..c86ff3b1d 100644 --- a/src/BatchCommands.cpp +++ b/src/BatchCommands.cpp @@ -39,7 +39,7 @@ processing. See also MacrosWindow and ApplyMacroDialog. #include "AllThemeResources.h" -#include "widgets/ErrorDialog.h" +#include "widgets/AudacityMessageBox.h" #include "commands/CommandContext.h" diff --git a/src/BatchProcessDialog.cpp b/src/BatchProcessDialog.cpp index 1442137d2..2ec07cc36 100644 --- a/src/BatchProcessDialog.cpp +++ b/src/BatchProcessDialog.cpp @@ -54,6 +54,7 @@ #include "FileNames.h" #include "import/Import.h" #include "widgets/ErrorDialog.h" +#include "widgets/AudacityMessageBox.h" #include "widgets/HelpSystem.h" #if wxUSE_ACCESSIBILITY diff --git a/src/Benchmark.cpp b/src/Benchmark.cpp index 2ac45f94b..53a5709bd 100644 --- a/src/Benchmark.cpp +++ b/src/Benchmark.cpp @@ -43,7 +43,8 @@ of the BlockFile system. #include "Prefs.h" #include "FileNames.h" -#include "widgets/ErrorDialog.h" +#include "widgets/AudacityMessageBox.h" +#include "widgets/wxPanelWrapper.h" class BenchmarkDialog final : public wxDialogWrapper { diff --git a/src/Dependencies.cpp b/src/Dependencies.cpp index 2bae89040..8e2748da2 100644 --- a/src/Dependencies.cpp +++ b/src/Dependencies.cpp @@ -57,7 +57,7 @@ AliasedFile s. #include "ShuttleGui.h" #include "WaveTrack.h" #include "WaveClip.h" -#include "widgets/ErrorDialog.h" +#include "widgets/AudacityMessageBox.h" #include "widgets/ProgressDialog.h" #include diff --git a/src/DirManager.cpp b/src/DirManager.cpp index 0e86b9cbc..20061ad65 100644 --- a/src/DirManager.cpp +++ b/src/DirManager.cpp @@ -90,7 +90,7 @@ #include "InconsistencyException.h" #include "Prefs.h" #include "widgets/Warning.h" -#include "widgets/ErrorDialog.h" +#include "widgets/AudacityMessageBox.h" #include "widgets/ProgressDialog.h" #if defined(__WXMAC__) diff --git a/src/FFmpeg.cpp b/src/FFmpeg.cpp index 370747cfb..56e829b94 100644 --- a/src/FFmpeg.cpp +++ b/src/FFmpeg.cpp @@ -22,13 +22,14 @@ License: GPL v2. See License.txt. #include "FileNames.h" #include "widgets/HelpSystem.h" -#include "widgets/ErrorDialog.h" +#include "widgets/AudacityMessageBox.h" #include #include #include #include #include +#include #if !defined(USE_FFMPEG) /// FFmpeg support may or may not be compiled in, diff --git a/src/FileFormats.cpp b/src/FileFormats.cpp index be5ee4fdc..4baf0e31b 100644 --- a/src/FileFormats.cpp +++ b/src/FileFormats.cpp @@ -21,7 +21,8 @@ information. #include #include #include "sndfile.h" -#include "widgets/ErrorDialog.h" +#include "Internat.h" +#include "widgets/AudacityMessageBox.h" #ifndef SNDFILE_1 #error Requires libsndfile 1.0 or higher diff --git a/src/FileNames.cpp b/src/FileNames.cpp index 7bc57e768..816214b58 100644 --- a/src/FileNames.cpp +++ b/src/FileNames.cpp @@ -36,7 +36,7 @@ used throughout Audacity into this one place. #include "Internat.h" #include "PlatformCompatibility.h" #include "wxFileNameWrapper.h" -#include "widgets/ErrorDialog.h" +#include "widgets/AudacityMessageBox.h" #include "../lib-src/FileDialog/FileDialog.h" #if defined(__WXMAC__) || defined(__WXGTK__) diff --git a/src/FreqWindow.cpp b/src/FreqWindow.cpp index a896ee437..d5dcbbc4c 100644 --- a/src/FreqWindow.cpp +++ b/src/FreqWindow.cpp @@ -65,6 +65,7 @@ and in the spectrogram spectral selection. #include #include +#include #include #include @@ -85,7 +86,7 @@ and in the spectrogram spectral selection. #include "./widgets/LinkingHtmlWindow.h" #include "./widgets/HelpSystem.h" -#include "widgets/ErrorDialog.h" +#include "widgets/AudacityMessageBox.h" #include "widgets/Ruler.h" #if wxUSE_ACCESSIBILITY diff --git a/src/LabelDialog.cpp b/src/LabelDialog.cpp index 6501c2528..cdeb8cf3a 100644 --- a/src/LabelDialog.cpp +++ b/src/LabelDialog.cpp @@ -34,6 +34,7 @@ #include "LabelTrack.h" #include "Prefs.h" #include "Project.h" +#include "widgets/AudacityMessageBox.h" #include "widgets/ErrorDialog.h" #include "widgets/Grid.h" #include "widgets/HelpSystem.h" diff --git a/src/LabelTrack.cpp b/src/LabelTrack.cpp index f17b93f3d..dfcf3e2d0 100644 --- a/src/LabelTrack.cpp +++ b/src/LabelTrack.cpp @@ -69,6 +69,7 @@ for drawing different aspects of the label and its text box. #include "commands/CommandManager.h" #include "effects/TimeWarper.h" +#include "widgets/AudacityMessageBox.h" #include "widgets/ErrorDialog.h" enum diff --git a/src/LangChoice.cpp b/src/LangChoice.cpp index 0330d55b3..4a39c9500 100644 --- a/src/LangChoice.cpp +++ b/src/LangChoice.cpp @@ -27,7 +27,8 @@ of languages for Audacity. #include "Languages.h" #include "ShuttleGui.h" -#include "widgets/ErrorDialog.h" +#include "widgets/AudacityMessageBox.h" +#include "widgets/wxPanelWrapper.h" class LangChoiceDialog final : public wxDialogWrapper { public: diff --git a/src/Legacy.cpp b/src/Legacy.cpp index ddf52c244..360ec7f02 100644 --- a/src/Legacy.cpp +++ b/src/Legacy.cpp @@ -40,7 +40,7 @@ On failure the old version is put back in place. #include #include -#include "widgets/ErrorDialog.h" +#include "widgets/AudacityMessageBox.h" #include "xml/XMLWriter.h" static bool ConvertLegacyTrack(wxTextFile *f, XMLFileWriter &xmlFile) diff --git a/src/Makefile.am b/src/Makefile.am index 151dd1cff..231186b1a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -680,6 +680,8 @@ audacity_SOURCES = \ widgets/ASlider.h \ widgets/AttachableScrollBar.cpp \ widgets/AttachableScrollBar.h \ + widgets/AudacityMessageBox.cpp \ + widgets/AudacityMessageBox.h \ widgets/BackedPanel.cpp \ widgets/BackedPanel.h \ widgets/ErrorDialog.cpp \ diff --git a/src/Makefile.in b/src/Makefile.in index 77014c922..9b732bb31 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -550,6 +550,7 @@ am__audacity_SOURCES_DIST = BlockFile.cpp BlockFile.h DirManager.cpp \ tracks/ui/ZoomHandle.h widgets/AButton.cpp widgets/AButton.h \ widgets/ASlider.cpp widgets/ASlider.h \ widgets/AttachableScrollBar.cpp widgets/AttachableScrollBar.h \ + widgets/AudacityMessageBox.cpp widgets/AudacityMessageBox.h \ widgets/BackedPanel.cpp widgets/BackedPanel.h \ widgets/ErrorDialog.cpp widgets/ErrorDialog.h \ widgets/ExpandingToolBar.cpp widgets/ExpandingToolBar.h \ @@ -882,6 +883,7 @@ am_audacity_OBJECTS = $(am__objects_1) audacity-AboutDialog.$(OBJEXT) \ widgets/audacity-AButton.$(OBJEXT) \ widgets/audacity-ASlider.$(OBJEXT) \ widgets/audacity-AttachableScrollBar.$(OBJEXT) \ + widgets/audacity-AudacityMessageBox.$(OBJEXT) \ widgets/audacity-BackedPanel.$(OBJEXT) \ widgets/audacity-ErrorDialog.$(OBJEXT) \ widgets/audacity-ExpandingToolBar.$(OBJEXT) \ @@ -1608,6 +1610,7 @@ audacity_SOURCES = $(libaudacity_la_SOURCES) AboutDialog.cpp \ tracks/ui/ZoomHandle.h widgets/AButton.cpp widgets/AButton.h \ widgets/ASlider.cpp widgets/ASlider.h \ widgets/AttachableScrollBar.cpp widgets/AttachableScrollBar.h \ + widgets/AudacityMessageBox.cpp widgets/AudacityMessageBox.h \ widgets/BackedPanel.cpp widgets/BackedPanel.h \ widgets/ErrorDialog.cpp widgets/ErrorDialog.h \ widgets/ExpandingToolBar.cpp widgets/ExpandingToolBar.h \ @@ -2326,6 +2329,8 @@ widgets/audacity-ASlider.$(OBJEXT): widgets/$(am__dirstamp) \ widgets/$(DEPDIR)/$(am__dirstamp) widgets/audacity-AttachableScrollBar.$(OBJEXT): \ widgets/$(am__dirstamp) widgets/$(DEPDIR)/$(am__dirstamp) +widgets/audacity-AudacityMessageBox.$(OBJEXT): \ + widgets/$(am__dirstamp) widgets/$(DEPDIR)/$(am__dirstamp) widgets/audacity-BackedPanel.$(OBJEXT): widgets/$(am__dirstamp) \ widgets/$(DEPDIR)/$(am__dirstamp) widgets/audacity-ErrorDialog.$(OBJEXT): widgets/$(am__dirstamp) \ @@ -2825,6 +2830,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@widgets/$(DEPDIR)/audacity-AButton.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@widgets/$(DEPDIR)/audacity-ASlider.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@widgets/$(DEPDIR)/audacity-AttachableScrollBar.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@widgets/$(DEPDIR)/audacity-AudacityMessageBox.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@widgets/$(DEPDIR)/audacity-BackedPanel.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@widgets/$(DEPDIR)/audacity-ErrorDialog.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@widgets/$(DEPDIR)/audacity-ExpandingToolBar.Po@am__quote@ @@ -7238,6 +7244,20 @@ widgets/audacity-AttachableScrollBar.obj: widgets/AttachableScrollBar.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -c -o widgets/audacity-AttachableScrollBar.obj `if test -f 'widgets/AttachableScrollBar.cpp'; then $(CYGPATH_W) 'widgets/AttachableScrollBar.cpp'; else $(CYGPATH_W) '$(srcdir)/widgets/AttachableScrollBar.cpp'; fi` +widgets/audacity-AudacityMessageBox.o: widgets/AudacityMessageBox.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT widgets/audacity-AudacityMessageBox.o -MD -MP -MF widgets/$(DEPDIR)/audacity-AudacityMessageBox.Tpo -c -o widgets/audacity-AudacityMessageBox.o `test -f 'widgets/AudacityMessageBox.cpp' || echo '$(srcdir)/'`widgets/AudacityMessageBox.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) widgets/$(DEPDIR)/audacity-AudacityMessageBox.Tpo widgets/$(DEPDIR)/audacity-AudacityMessageBox.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='widgets/AudacityMessageBox.cpp' object='widgets/audacity-AudacityMessageBox.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -c -o widgets/audacity-AudacityMessageBox.o `test -f 'widgets/AudacityMessageBox.cpp' || echo '$(srcdir)/'`widgets/AudacityMessageBox.cpp + +widgets/audacity-AudacityMessageBox.obj: widgets/AudacityMessageBox.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT widgets/audacity-AudacityMessageBox.obj -MD -MP -MF widgets/$(DEPDIR)/audacity-AudacityMessageBox.Tpo -c -o widgets/audacity-AudacityMessageBox.obj `if test -f 'widgets/AudacityMessageBox.cpp'; then $(CYGPATH_W) 'widgets/AudacityMessageBox.cpp'; else $(CYGPATH_W) '$(srcdir)/widgets/AudacityMessageBox.cpp'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) widgets/$(DEPDIR)/audacity-AudacityMessageBox.Tpo widgets/$(DEPDIR)/audacity-AudacityMessageBox.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='widgets/AudacityMessageBox.cpp' object='widgets/audacity-AudacityMessageBox.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -c -o widgets/audacity-AudacityMessageBox.obj `if test -f 'widgets/AudacityMessageBox.cpp'; then $(CYGPATH_W) 'widgets/AudacityMessageBox.cpp'; else $(CYGPATH_W) '$(srcdir)/widgets/AudacityMessageBox.cpp'; fi` + widgets/audacity-BackedPanel.o: widgets/BackedPanel.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(audacity_CPPFLAGS) $(CPPFLAGS) $(audacity_CXXFLAGS) $(CXXFLAGS) -MT widgets/audacity-BackedPanel.o -MD -MP -MF widgets/$(DEPDIR)/audacity-BackedPanel.Tpo -c -o widgets/audacity-BackedPanel.o `test -f 'widgets/BackedPanel.cpp' || echo '$(srcdir)/'`widgets/BackedPanel.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) widgets/$(DEPDIR)/audacity-BackedPanel.Tpo widgets/$(DEPDIR)/audacity-BackedPanel.Po diff --git a/src/ModuleManager.cpp b/src/ModuleManager.cpp index b26cca80e..065f1203e 100755 --- a/src/ModuleManager.cpp +++ b/src/ModuleManager.cpp @@ -43,7 +43,7 @@ i.e. an alternative to the usual interface, for Audacity. #include "widgets/MultiDialog.h" -#include "widgets/ErrorDialog.h" +#include "widgets/AudacityMessageBox.h" #define initFnName "ExtensionModuleInit" #define versionFnName "GetVersionString" diff --git a/src/PluginManager.cpp b/src/PluginManager.cpp index 1ad21d28e..0e49824d8 100644 --- a/src/PluginManager.cpp +++ b/src/PluginManager.cpp @@ -47,7 +47,7 @@ for shared and private configs - which need to move out. #include "Prefs.h" #include "ShuttleGui.h" #include "wxFileNameWrapper.h" -#include "widgets/ErrorDialog.h" +#include "widgets/AudacityMessageBox.h" #include "widgets/ProgressDialog.h" #include diff --git a/src/Printing.cpp b/src/Printing.cpp index 235f3c435..cab623dbf 100644 --- a/src/Printing.cpp +++ b/src/Printing.cpp @@ -28,7 +28,7 @@ #include "ViewInfo.h" #include "WaveTrack.h" #include "widgets/Ruler.h" -#include "widgets/ErrorDialog.h" +#include "widgets/AudacityMessageBox.h" #include "TrackPanelDrawingContext.h" diff --git a/src/Project.cpp b/src/Project.cpp index c43ad8a08..48cfddab4 100644 --- a/src/Project.cpp +++ b/src/Project.cpp @@ -127,6 +127,7 @@ scroll information. It also has some status flags. #include "DirManager.h" #include "prefs/PrefsDialog.h" #include "widgets/LinkingHtmlWindow.h" +#include "widgets/AudacityMessageBox.h" #include "widgets/ErrorDialog.h" #include "widgets/Warning.h" #include "xml/XMLFileReader.h" diff --git a/src/ProjectFSCK.cpp b/src/ProjectFSCK.cpp index a8fc187ec..3fc47588e 100644 --- a/src/ProjectFSCK.cpp +++ b/src/ProjectFSCK.cpp @@ -17,7 +17,7 @@ #include "BlockFile.h" #include "DirManager.h" -#include "widgets/ErrorDialog.h" +#include "widgets/AudacityMessageBox.h" #include "Internat.h" #include "MemoryX.h" #include "MissingAliasFileDialog.h" diff --git a/src/Sequence.cpp b/src/Sequence.cpp index 48ebadc30..03ed5f84a 100644 --- a/src/Sequence.cpp +++ b/src/Sequence.cpp @@ -47,7 +47,7 @@ #include "InconsistencyException.h" -#include "widgets/ErrorDialog.h" +#include "widgets/AudacityMessageBox.h" size_t Sequence::sMaxDiskBlockSize = 1048576; diff --git a/src/SplashDialog.cpp b/src/SplashDialog.cpp index 857245371..0f0aac5b1 100644 --- a/src/SplashDialog.cpp +++ b/src/SplashDialog.cpp @@ -36,7 +36,7 @@ most commonly asked questions about Audacity. #include "FileNames.h" #include "ShuttleGui.h" -#include "widgets/ErrorDialog.h" +#include "widgets/AudacityMessageBox.h" #include "widgets/LinkingHtmlWindow.h" #include "AllThemeResources.h" diff --git a/src/Tags.cpp b/src/Tags.cpp index 5eba75489..4fb7ad359 100644 --- a/src/Tags.cpp +++ b/src/Tags.cpp @@ -48,7 +48,7 @@ #include "ShuttleGui.h" #include "TranslatableStringArray.h" #include "widgets/Grid.h" -#include "widgets/ErrorDialog.h" +#include "widgets/AudacityMessageBox.h" #include "widgets/HelpSystem.h" #include "xml/XMLFileReader.h" diff --git a/src/Theme.cpp b/src/Theme.cpp index 5cdebb30b..dd371ad46 100644 --- a/src/Theme.cpp +++ b/src/Theme.cpp @@ -76,7 +76,8 @@ can't be. #include "FileNames.h" #include "Prefs.h" #include "ImageManipulation.h" -#include "widgets/ErrorDialog.h" +#include "Internat.h" +#include "widgets/AudacityMessageBox.h" // JKC: First get the MAC specific images. // As we've disabled USE_AQUA_THEME, we need to name each file we use. diff --git a/src/TimerRecordDialog.cpp b/src/TimerRecordDialog.cpp index a5bf1425d..0d1e3b4bc 100644 --- a/src/TimerRecordDialog.cpp +++ b/src/TimerRecordDialog.cpp @@ -49,6 +49,7 @@ #include "Prefs.h" #include "widgets/NumericTextCtrl.h" #include "widgets/HelpSystem.h" +#include "widgets/AudacityMessageBox.h" #include "widgets/ErrorDialog.h" #include "widgets/ProgressDialog.h" diff --git a/src/VoiceKey.cpp b/src/VoiceKey.cpp index 39f03f4d3..5e4e01038 100644 --- a/src/VoiceKey.cpp +++ b/src/VoiceKey.cpp @@ -31,6 +31,7 @@ or "OFF" point #include #include "WaveTrack.h" +#include "widgets/AudacityMessageBox.h" #include "widgets/ErrorDialog.h" using std::cout; diff --git a/src/commands/AudacityCommand.cpp b/src/commands/AudacityCommand.cpp index 89e6dbfcf..1d295b08d 100644 --- a/src/commands/AudacityCommand.cpp +++ b/src/commands/AudacityCommand.cpp @@ -41,7 +41,7 @@ ShuttleGui. #include "../ShuttleGui.h" #include "../widgets/ProgressDialog.h" #include "../widgets/HelpSystem.h" -#include "../widgets/ErrorDialog.h" +#include "../widgets/AudacityMessageBox.h" #include diff --git a/src/commands/CommandManager.cpp b/src/commands/CommandManager.cpp index b5804eb17..14f36bbbd 100644 --- a/src/commands/CommandManager.cpp +++ b/src/commands/CommandManager.cpp @@ -96,6 +96,7 @@ CommandManager. It holds the callback for one command. #include "../PluginManager.h" #include "../effects/EffectManager.h" #include "../widgets/LinkingHtmlWindow.h" +#include "../widgets/AudacityMessageBox.h" #include "../widgets/ErrorDialog.h" #include "../widgets/HelpSystem.h" diff --git a/src/commands/CommandTargets.cpp b/src/commands/CommandTargets.cpp index 6668002a3..490d3fbe5 100644 --- a/src/commands/CommandTargets.cpp +++ b/src/commands/CommandTargets.cpp @@ -27,8 +27,10 @@ capture the more lengthy output from some commands. #include #include #include +#include #include "../ShuttleGui.h" -#include "../widgets/ErrorDialog.h" +#include "../widgets/AudacityMessageBox.h" +#include "../widgets/wxPanelWrapper.h" void CommandMessageTarget::StartArray() { diff --git a/src/commands/CompareAudioCommand.cpp b/src/commands/CompareAudioCommand.cpp index c3502b85b..e221e7d5b 100644 --- a/src/commands/CompareAudioCommand.cpp +++ b/src/commands/CompareAudioCommand.cpp @@ -30,7 +30,7 @@ threshold of difference in two selected tracks #include "../Shuttle.h" #include "../ShuttleGui.h" -#include "../widgets/ErrorDialog.h" +#include "../widgets/AudacityMessageBox.h" #include "../widgets/valnum.h" #include "CommandContext.h" diff --git a/src/commands/Demo.cpp b/src/commands/Demo.cpp index 3562c2b1e..de54f540a 100644 --- a/src/commands/Demo.cpp +++ b/src/commands/Demo.cpp @@ -28,7 +28,7 @@ parameters. It is for development purposes. #include "../Shuttle.h" #include "../ShuttleGui.h" -#include "../widgets/ErrorDialog.h" +#include "../widgets/AudacityMessageBox.h" #include "../widgets/valnum.h" #include "../commands/CommandContext.h" diff --git a/src/effects/AutoDuck.cpp b/src/effects/AutoDuck.cpp index 682101baf..97fe32809 100644 --- a/src/effects/AutoDuck.cpp +++ b/src/effects/AutoDuck.cpp @@ -34,7 +34,7 @@ #include "../widgets/valnum.h" #include "../WaveTrack.h" -#include "../widgets/ErrorDialog.h" +#include "../widgets/AudacityMessageBox.h" // Define keys, defaults, minimums, and maximums for the effect parameters // diff --git a/src/effects/ClickRemoval.cpp b/src/effects/ClickRemoval.cpp index 4d466e384..421f6e02e 100644 --- a/src/effects/ClickRemoval.cpp +++ b/src/effects/ClickRemoval.cpp @@ -36,7 +36,7 @@ #include "../Prefs.h" #include "../Shuttle.h" #include "../ShuttleGui.h" -#include "../widgets/ErrorDialog.h" +#include "../widgets/AudacityMessageBox.h" #include "../widgets/valnum.h" #include "../WaveTrack.h" diff --git a/src/effects/Contrast.cpp b/src/effects/Contrast.cpp index f2836118a..cec33a2db 100644 --- a/src/effects/Contrast.cpp +++ b/src/effects/Contrast.cpp @@ -20,6 +20,7 @@ #include "../widgets/LinkingHtmlWindow.h" #include "../widgets/HelpSystem.h" #include "../widgets/NumericTextCtrl.h" +#include "../widgets/AudacityMessageBox.h" #include "../widgets/ErrorDialog.h" #include diff --git a/src/effects/Echo.cpp b/src/effects/Echo.cpp index 473ddedd7..4bcbee04a 100644 --- a/src/effects/Echo.cpp +++ b/src/effects/Echo.cpp @@ -28,7 +28,7 @@ #include "../ShuttleGui.h" #include "../Shuttle.h" -#include "../widgets/ErrorDialog.h" +#include "../widgets/AudacityMessageBox.h" #include "../widgets/valnum.h" // Define keys, defaults, minimums, and maximums for the effect parameters diff --git a/src/effects/Effect.cpp b/src/effects/Effect.cpp index bd322748f..f13866a6d 100644 --- a/src/effects/Effect.cpp +++ b/src/effects/Effect.cpp @@ -69,6 +69,7 @@ greater use in future. #include "../widgets/HelpSystem.h" #include "../widgets/LinkingHtmlWindow.h" #include "../widgets/NumericTextCtrl.h" +#include "../widgets/AudacityMessageBox.h" #include "../widgets/ErrorDialog.h" #include "../FileNames.h" #include "../commands/CommandContext.h" diff --git a/src/effects/EffectManager.cpp b/src/effects/EffectManager.cpp index a0dc02879..817b0ae60 100644 --- a/src/effects/EffectManager.cpp +++ b/src/effects/EffectManager.cpp @@ -27,7 +27,7 @@ effects. #include #include -#include "../widgets/ErrorDialog.h" +#include "../widgets/AudacityMessageBox.h" #if defined(EXPERIMENTAL_EFFECTS_RACK) #include "EffectRack.h" diff --git a/src/effects/FindClipping.cpp b/src/effects/FindClipping.cpp index 7ee2572b7..4cdf4b358 100644 --- a/src/effects/FindClipping.cpp +++ b/src/effects/FindClipping.cpp @@ -29,7 +29,7 @@ #include "../Shuttle.h" #include "../ShuttleGui.h" #include "../widgets/valnum.h" -#include "../widgets/ErrorDialog.h" +#include "../widgets/AudacityMessageBox.h" #include "../LabelTrack.h" #include "../WaveTrack.h" diff --git a/src/effects/Generator.cpp b/src/effects/Generator.cpp index 09673668c..d6f0380b7 100644 --- a/src/effects/Generator.cpp +++ b/src/effects/Generator.cpp @@ -22,7 +22,7 @@ #include "TimeWarper.h" -#include "../widgets/ErrorDialog.h" +#include "../widgets/AudacityMessageBox.h" bool Generator::Process() { diff --git a/src/effects/NoiseReduction.cpp b/src/effects/NoiseReduction.cpp index 87d083e21..f685950cd 100644 --- a/src/effects/NoiseReduction.cpp +++ b/src/effects/NoiseReduction.cpp @@ -49,7 +49,7 @@ #include "../RealFFTf.h" #include "../WaveTrack.h" -#include "../widgets/ErrorDialog.h" +#include "../widgets/AudacityMessageBox.h" #include "../widgets/valnum.h" #include diff --git a/src/effects/Paulstretch.cpp b/src/effects/Paulstretch.cpp index 6493d126e..329d40fcc 100644 --- a/src/effects/Paulstretch.cpp +++ b/src/effects/Paulstretch.cpp @@ -29,7 +29,7 @@ #include "../ShuttleGui.h" #include "../FFT.h" #include "../widgets/valnum.h" -#include "../widgets/ErrorDialog.h" +#include "../widgets/AudacityMessageBox.h" #include "../Prefs.h" #include "../WaveTrack.h" diff --git a/src/effects/Repair.cpp b/src/effects/Repair.cpp index 8bf539050..3cefdd4e9 100644 --- a/src/effects/Repair.cpp +++ b/src/effects/Repair.cpp @@ -30,7 +30,7 @@ the audio, rather than actually finding the clicks. #include "../InterpolateAudio.h" #include "../WaveTrack.h" -#include "../widgets/ErrorDialog.h" +#include "../widgets/AudacityMessageBox.h" EffectRepair::EffectRepair() { diff --git a/src/effects/ScienFilter.cpp b/src/effects/ScienFilter.cpp index 2b4114e33..922cc8f6e 100644 --- a/src/effects/ScienFilter.cpp +++ b/src/effects/ScienFilter.cpp @@ -60,7 +60,7 @@ a graph for EffectScienFilter. #include "../ShuttleGui.h" #include "../WaveTrack.h" #include "../widgets/valnum.h" -#include "../widgets/ErrorDialog.h" +#include "../widgets/AudacityMessageBox.h" #include "../widgets/Ruler.h" #include "../widgets/WindowAccessible.h" diff --git a/src/effects/TruncSilence.cpp b/src/effects/TruncSilence.cpp index 47969fbef..a526aa4e4 100644 --- a/src/effects/TruncSilence.cpp +++ b/src/effects/TruncSilence.cpp @@ -33,7 +33,7 @@ #include "../ShuttleGui.h" #include "../WaveTrack.h" #include "../widgets/valnum.h" -#include "../widgets/ErrorDialog.h" +#include "../widgets/AudacityMessageBox.h" class Enums { public: diff --git a/src/effects/VST/VSTEffect.cpp b/src/effects/VST/VSTEffect.cpp index 391eb0836..56b531b77 100644 --- a/src/effects/VST/VSTEffect.cpp +++ b/src/effects/VST/VSTEffect.cpp @@ -85,7 +85,7 @@ #include "../../ShuttleGui.h" #include "../../effects/Effect.h" #include "../../widgets/valnum.h" -#include "../../widgets/ErrorDialog.h" +#include "../../widgets/AudacityMessageBox.h" #include "../../widgets/NumericTextCtrl.h" #include "../../xml/XMLFileReader.h" diff --git a/src/effects/lv2/LV2Effect.cpp b/src/effects/lv2/LV2Effect.cpp index 3a68237d8..3e19895b9 100644 --- a/src/effects/lv2/LV2Effect.cpp +++ b/src/effects/lv2/LV2Effect.cpp @@ -36,7 +36,8 @@ #include "../../ShuttleGui.h" #include "../../widgets/valnum.h" -#include "../../widgets/ErrorDialog.h" +#include "../../widgets/AudacityMessageBox.h" +#include "../../widgets/wxPanelWrapper.h" #include "../../widgets/NumericTextCtrl.h" #include "lilv/lilv.h" diff --git a/src/effects/nyquist/Nyquist.cpp b/src/effects/nyquist/Nyquist.cpp index ca1c86116..81a297431 100644 --- a/src/effects/nyquist/Nyquist.cpp +++ b/src/effects/nyquist/Nyquist.cpp @@ -66,7 +66,7 @@ effects from this one class. #include "../../WaveClip.h" #include "../../WaveTrack.h" #include "../../widgets/valnum.h" -#include "../../widgets/ErrorDialog.h" +#include "../../widgets/AudacityMessageBox.h" #include "../../Prefs.h" #include "../../wxFileNameWrapper.h" #include "../../prefs/GUIPrefs.h" diff --git a/src/effects/vamp/VampEffect.cpp b/src/effects/vamp/VampEffect.cpp index 5a0cde8c7..7e460e1d0 100644 --- a/src/effects/vamp/VampEffect.cpp +++ b/src/effects/vamp/VampEffect.cpp @@ -38,7 +38,7 @@ #include "../../ShuttleGui.h" #include "../../widgets/valnum.h" -#include "../../widgets/ErrorDialog.h" +#include "../../widgets/AudacityMessageBox.h" #include "../../LabelTrack.h" #include "../../WaveTrack.h" diff --git a/src/export/Export.cpp b/src/export/Export.cpp index e08fb18b9..35607b63e 100644 --- a/src/export/Export.cpp +++ b/src/export/Export.cpp @@ -67,7 +67,7 @@ #include "../Project.h" #include "../ShuttleGui.h" #include "../WaveTrack.h" -#include "../widgets/ErrorDialog.h" +#include "../widgets/AudacityMessageBox.h" #include "../widgets/Warning.h" #include "../widgets/HelpSystem.h" #include "../AColor.h" diff --git a/src/export/ExportCL.cpp b/src/export/ExportCL.cpp index f83d812d8..53c54fdc9 100644 --- a/src/export/ExportCL.cpp +++ b/src/export/ExportCL.cpp @@ -36,7 +36,7 @@ #include "../ShuttleGui.h" #include "../float_cast.h" #include "../widgets/FileHistory.h" -#include "../widgets/ErrorDialog.h" +#include "../widgets/AudacityMessageBox.h" #include "../widgets/ProgressDialog.h" diff --git a/src/export/ExportFFmpeg.cpp b/src/export/ExportFFmpeg.cpp index 9757a90fc..ad2c5ded1 100644 --- a/src/export/ExportFFmpeg.cpp +++ b/src/export/ExportFFmpeg.cpp @@ -39,7 +39,7 @@ function. #include "../Mix.h" #include "../Project.h" #include "../Tags.h" -#include "../widgets/ErrorDialog.h" +#include "../widgets/AudacityMessageBox.h" #include "../widgets/ProgressDialog.h" #include "Export.h" diff --git a/src/export/ExportFFmpegDialogs.cpp b/src/export/ExportFFmpegDialogs.cpp index 12fa8de1a..c6aa665f5 100644 --- a/src/export/ExportFFmpegDialogs.cpp +++ b/src/export/ExportFFmpegDialogs.cpp @@ -61,7 +61,7 @@ #include "../Project.h" #include "../Tags.h" #include "../TranslatableStringArray.h" -#include "../widgets/ErrorDialog.h" +#include "../widgets/AudacityMessageBox.h" #include "Export.h" diff --git a/src/export/ExportFLAC.cpp b/src/export/ExportFLAC.cpp index cb8f7d4d1..2ff4d3a4b 100644 --- a/src/export/ExportFLAC.cpp +++ b/src/export/ExportFLAC.cpp @@ -39,7 +39,7 @@ and libvorbis examples, Monty #include "../Tags.h" -#include "../widgets/ErrorDialog.h" +#include "../widgets/AudacityMessageBox.h" #include "../widgets/ProgressDialog.h" //---------------------------------------------------------------------------- diff --git a/src/export/ExportMP2.cpp b/src/export/ExportMP2.cpp index cbc9a3465..724f37022 100644 --- a/src/export/ExportMP2.cpp +++ b/src/export/ExportMP2.cpp @@ -53,7 +53,7 @@ #include "../Project.h" #include "../ShuttleGui.h" #include "../Tags.h" -#include "../widgets/ErrorDialog.h" +#include "../widgets/AudacityMessageBox.h" #include "../widgets/ProgressDialog.h" #define LIBTWOLAME_STATIC diff --git a/src/export/ExportMP3.cpp b/src/export/ExportMP3.cpp index 813e1ac22..b8d0d9401 100644 --- a/src/export/ExportMP3.cpp +++ b/src/export/ExportMP3.cpp @@ -89,7 +89,7 @@ #include "../Tags.h" #include "../widgets/HelpSystem.h" #include "../widgets/LinkingHtmlWindow.h" -#include "../widgets/ErrorDialog.h" +#include "../widgets/AudacityMessageBox.h" #include "../widgets/ProgressDialog.h" #include "Export.h" diff --git a/src/export/ExportMultiple.cpp b/src/export/ExportMultiple.cpp index 8474d658d..1c0197ca9 100644 --- a/src/export/ExportMultiple.cpp +++ b/src/export/ExportMultiple.cpp @@ -48,6 +48,7 @@ #include "../Tags.h" #include "../WaveTrack.h" #include "../widgets/HelpSystem.h" +#include "../widgets/AudacityMessageBox.h" #include "../widgets/ErrorDialog.h" #include "../widgets/ProgressDialog.h" diff --git a/src/export/ExportOGG.cpp b/src/export/ExportOGG.cpp index 6fbcb2fae..912e0cdc9 100644 --- a/src/export/ExportOGG.cpp +++ b/src/export/ExportOGG.cpp @@ -34,7 +34,7 @@ #include "../ShuttleGui.h" #include "../Tags.h" -#include "../widgets/ErrorDialog.h" +#include "../widgets/AudacityMessageBox.h" #include "../widgets/ProgressDialog.h" //---------------------------------------------------------------------------- diff --git a/src/export/ExportPCM.cpp b/src/export/ExportPCM.cpp index bf1e52227..14a4cfb33 100644 --- a/src/export/ExportPCM.cpp +++ b/src/export/ExportPCM.cpp @@ -32,6 +32,7 @@ #include "../ShuttleGui.h" #include "../Tags.h" #include "../ondemand/ODManager.h" +#include "../widgets/AudacityMessageBox.h" #include "../widgets/ErrorDialog.h" #include "../widgets/ProgressDialog.h" diff --git a/src/import/ImportLOF.cpp b/src/import/ImportLOF.cpp index ef36033e7..f9d588abb 100644 --- a/src/import/ImportLOF.cpp +++ b/src/import/ImportLOF.cpp @@ -89,7 +89,7 @@ #include "../Project.h" #include "../FileFormats.h" #include "../Prefs.h" -#include "../widgets/ErrorDialog.h" +#include "../widgets/AudacityMessageBox.h" #include "../widgets/ProgressDialog.h" #define BINARY_FILE_CHECK_BUFFER_SIZE 1024 diff --git a/src/import/ImportMIDI.cpp b/src/import/ImportMIDI.cpp index 506b773f2..86c1f63cb 100644 --- a/src/import/ImportMIDI.cpp +++ b/src/import/ImportMIDI.cpp @@ -22,7 +22,7 @@ //#include "mfmidi.h" #include "../NoteTrack.h" -#include "../widgets/ErrorDialog.h" +#include "../widgets/AudacityMessageBox.h" bool ImportMIDI(const FilePath &fName, NoteTrack * dest) { diff --git a/src/import/ImportQT.cpp b/src/import/ImportQT.cpp index e1cd60b1f..f44f82914 100644 --- a/src/import/ImportQT.cpp +++ b/src/import/ImportQT.cpp @@ -17,7 +17,7 @@ #include "ImportQT.h" #include "ImportPlugin.h" -#include "../widgets/ErrorDialog.h" +#include "../widgets/AudacityMessageBox.h" #include "../widgets/ProgressDialog.h" #define DESC _("QuickTime files") diff --git a/src/menus/EditMenus.cpp b/src/menus/EditMenus.cpp index 1b415ec0b..ab0470811 100644 --- a/src/menus/EditMenus.cpp +++ b/src/menus/EditMenus.cpp @@ -17,7 +17,7 @@ #include "../prefs/PrefsDialog.h" #include "../prefs/SpectrogramSettings.h" #include "../prefs/WaveformSettings.h" -#include "../widgets/ErrorDialog.h" +#include "../widgets/AudacityMessageBox.h" // private helper classes and functions namespace { diff --git a/src/menus/FileMenus.cpp b/src/menus/FileMenus.cpp index e353b3237..5ae0ffcd5 100644 --- a/src/menus/FileMenus.cpp +++ b/src/menus/FileMenus.cpp @@ -13,7 +13,7 @@ #include "../commands/CommandContext.h" #include "../commands/CommandManager.h" #include "../export/ExportMultiple.h" -#include "../widgets/ErrorDialog.h" +#include "../widgets/AudacityMessageBox.h" #include "../widgets/FileHistory.h" #ifdef USE_MIDI diff --git a/src/menus/HelpMenus.cpp b/src/menus/HelpMenus.cpp index a09be2447..cc3c97a45 100644 --- a/src/menus/HelpMenus.cpp +++ b/src/menus/HelpMenus.cpp @@ -20,7 +20,7 @@ #include "../Theme.h" #include "../commands/CommandContext.h" #include "../commands/CommandManager.h" -#include "../widgets/ErrorDialog.h" +#include "../widgets/AudacityMessageBox.h" #include "../widgets/HelpSystem.h" #include "../widgets/LinkingHtmlWindow.h" diff --git a/src/menus/TrackMenus.cpp b/src/menus/TrackMenus.cpp index 16064833d..18445ee44 100644 --- a/src/menus/TrackMenus.cpp +++ b/src/menus/TrackMenus.cpp @@ -19,7 +19,7 @@ #include "../commands/CommandManager.h" #include "../effects/EffectManager.h" #include "../widgets/ASlider.h" -#include "../widgets/ErrorDialog.h" +#include "../widgets/AudacityMessageBox.h" #include "../widgets/ProgressDialog.h" #include diff --git a/src/menus/TransportMenus.cpp b/src/menus/TransportMenus.cpp index 2aa7bc85b..5d5d7e3c4 100644 --- a/src/menus/TransportMenus.cpp +++ b/src/menus/TransportMenus.cpp @@ -18,6 +18,7 @@ #include "../toolbars/ControlToolBar.h" #include "../toolbars/TranscriptionToolBar.h" #include "../tracks/ui/Scrubbing.h" +#include "../widgets/AudacityMessageBox.h" #include "../widgets/ErrorDialog.h" #include diff --git a/src/prefs/DirectoriesPrefs.cpp b/src/prefs/DirectoriesPrefs.cpp index 7f7a746bb..232f72829 100644 --- a/src/prefs/DirectoriesPrefs.cpp +++ b/src/prefs/DirectoriesPrefs.cpp @@ -35,7 +35,7 @@ #include "../FileNames.h" #include "../Prefs.h" #include "../ShuttleGui.h" -#include "../widgets/ErrorDialog.h" +#include "../widgets/AudacityMessageBox.h" enum { TempDirID = 1000, diff --git a/src/prefs/ExtImportPrefs.cpp b/src/prefs/ExtImportPrefs.cpp index d99855b4d..5903c2027 100644 --- a/src/prefs/ExtImportPrefs.cpp +++ b/src/prefs/ExtImportPrefs.cpp @@ -24,7 +24,7 @@ #include "../Prefs.h" #include "../ShuttleGui.h" #include "../import/Import.h" -#include "../widgets/ErrorDialog.h" +#include "../widgets/AudacityMessageBox.h" #include "../widgets/Grid.h" #define EXTIMPORT_MIME_SUPPORT 0 diff --git a/src/prefs/GUIPrefs.cpp b/src/prefs/GUIPrefs.cpp index 797ac6e5c..78bdd3436 100644 --- a/src/prefs/GUIPrefs.cpp +++ b/src/prefs/GUIPrefs.cpp @@ -36,7 +36,7 @@ #include "ThemePrefs.h" #include "../AColor.h" #include "../TranslatableStringArray.h" -#include "../widgets/ErrorDialog.h" +#include "../widgets/AudacityMessageBox.h" wxDEFINE_EVENT(EVT_LANGUAGE_CHANGE, wxCommandEvent); diff --git a/src/prefs/KeyConfigPrefs.cpp b/src/prefs/KeyConfigPrefs.cpp index ac0900f66..54518475e 100644 --- a/src/prefs/KeyConfigPrefs.cpp +++ b/src/prefs/KeyConfigPrefs.cpp @@ -33,6 +33,7 @@ KeyConfigPrefs and MousePrefs use. #include #include #include +#include #include "../Prefs.h" #include "../Project.h" @@ -44,7 +45,7 @@ KeyConfigPrefs and MousePrefs use. #include "../FileNames.h" #include "../widgets/KeyView.h" -#include "../widgets/ErrorDialog.h" +#include "../widgets/AudacityMessageBox.h" #if wxUSE_ACCESSIBILITY #include "../widgets/WindowAccessible.h" diff --git a/src/prefs/LibraryPrefs.cpp b/src/prefs/LibraryPrefs.cpp index 2219a764a..f56403a92 100644 --- a/src/prefs/LibraryPrefs.cpp +++ b/src/prefs/LibraryPrefs.cpp @@ -29,7 +29,7 @@ MP3 and FFmpeg encoding libraries. #include "../export/ExportMP3.h" #include "../widgets/LinkingHtmlWindow.h" #include "../widgets/HelpSystem.h" -#include "../widgets/ErrorDialog.h" +#include "../widgets/AudacityMessageBox.h" //////////////////////////////////////////////////////////////////////////////// diff --git a/src/prefs/MidiIOPrefs.cpp b/src/prefs/MidiIOPrefs.cpp index c7be3a217..7cb4bd7f9 100644 --- a/src/prefs/MidiIOPrefs.cpp +++ b/src/prefs/MidiIOPrefs.cpp @@ -34,12 +34,13 @@ other settings. #include #include +#include #include "../../lib-src/portmidi/pm_common/portmidi.h" #include "../Prefs.h" #include "../ShuttleGui.h" -#include "../widgets/ErrorDialog.h" +#include "../widgets/AudacityMessageBox.h" #define DEFAULT_SYNTH_LATENCY 5 diff --git a/src/prefs/SpectrogramSettings.cpp b/src/prefs/SpectrogramSettings.cpp index 157d088fd..38dd0b80c 100644 --- a/src/prefs/SpectrogramSettings.cpp +++ b/src/prefs/SpectrogramSettings.cpp @@ -24,11 +24,12 @@ Paul Licameli #include #include "../FFT.h" +#include "../Internat.h" #include "../Prefs.h" #include -#include "../widgets/ErrorDialog.h" +#include "../widgets/AudacityMessageBox.h" SpectrogramSettings::Globals::Globals() { diff --git a/src/prefs/SpectrumPrefs.cpp b/src/prefs/SpectrumPrefs.cpp index 72c672b34..19cbfc1cf 100644 --- a/src/prefs/SpectrumPrefs.cpp +++ b/src/prefs/SpectrumPrefs.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #include "../FFT.h" #include "../Project.h" @@ -32,7 +33,7 @@ #include -#include "../widgets/ErrorDialog.h" +#include "../widgets/AudacityMessageBox.h" SpectrumPrefs::SpectrumPrefs(wxWindow * parent, wxWindowID winid, WaveTrack *wt) : PrefsPanel(parent, winid, wt ? _("Spectrogram Settings") : _("Spectrograms")) diff --git a/src/toolbars/DeviceToolBar.cpp b/src/toolbars/DeviceToolBar.cpp index c692b3600..4eaada867 100644 --- a/src/toolbars/DeviceToolBar.cpp +++ b/src/toolbars/DeviceToolBar.cpp @@ -46,7 +46,7 @@ #include "../ShuttleGui.h" #include "../widgets/Grabber.h" #include "../DeviceManager.h" -#include "../widgets/ErrorDialog.h" +#include "../widgets/AudacityMessageBox.h" #include "../widgets/Grabber.h" #if wxUSE_ACCESSIBILITY diff --git a/src/tracks/playabletrack/wavetrack/ui/SampleHandle.cpp b/src/tracks/playabletrack/wavetrack/ui/SampleHandle.cpp index fd296036a..1e945b383 100644 --- a/src/tracks/playabletrack/wavetrack/ui/SampleHandle.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/SampleHandle.cpp @@ -26,7 +26,7 @@ Paul Licameli split from TrackPanel.cpp #include "../../../../UndoManager.h" #include "../../../../WaveTrack.h" #include "../../../../../images/Cursors.h" -#include "../../../../widgets/ErrorDialog.h" +#include "../../../../widgets/AudacityMessageBox.h" static const int SMOOTHING_KERNEL_RADIUS = 3; diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp b/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp index 62f432753..412a9497c 100644 --- a/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp @@ -30,7 +30,7 @@ Paul Licameli split from TrackPanel.cpp #include "../../../../prefs/SpectrumPrefs.h" #include "../../../../prefs/TracksBehaviorsPrefs.h" #include "../../../../prefs/WaveformPrefs.h" -#include "../../../../widgets/ErrorDialog.h" +#include "../../../../widgets/AudacityMessageBox.h" #include #include diff --git a/src/widgets/AudacityMessageBox.cpp b/src/widgets/AudacityMessageBox.cpp new file mode 100644 index 000000000..834601dbe --- /dev/null +++ b/src/widgets/AudacityMessageBox.cpp @@ -0,0 +1,17 @@ +/********************************************************************** + + Audacity: A Digital Audio Editor + + AudacityMessageBox.cpp + + Paul Licameli split this out of ErrorDialog.cpp + +**********************************************************************/ + +#include "AudacityMessageBox.h" +#include "../Internat.h" + +wxString AudacityMessageBoxCaptionStr() +{ + return _("Message"); +} diff --git a/src/widgets/AudacityMessageBox.h b/src/widgets/AudacityMessageBox.h new file mode 100644 index 000000000..f2f9f0547 --- /dev/null +++ b/src/widgets/AudacityMessageBox.h @@ -0,0 +1,28 @@ +/********************************************************************** + + Audacity: A Digital Audio Editor + + AudacityMessageBox.h + + Paul Licameli split this out of ErrorDialog.h + +**********************************************************************/ + +#ifndef __AUDACITY_MESSAGE_BOX__ +#define __AUDACITY_MESSAGE_BOX__ + +#include + +extern wxString AudacityMessageBoxCaptionStr(); + +// Do not use wxMessageBox!! Its default window title does not translate! +inline int AudacityMessageBox(const wxString& message, + const wxString& caption = AudacityMessageBoxCaptionStr(), + long style = wxOK | wxCENTRE, + wxWindow *parent = NULL, + int x = wxDefaultCoord, int y = wxDefaultCoord) +{ + return ::wxMessageBox(message, caption, style, parent, x, y); +} + +#endif diff --git a/src/widgets/ErrorDialog.cpp b/src/widgets/ErrorDialog.cpp index f1e844779..ec637b6fd 100644 --- a/src/widgets/ErrorDialog.cpp +++ b/src/widgets/ErrorDialog.cpp @@ -169,11 +169,6 @@ void ShowModelessErrorDialog(wxWindow *parent, // but in practice Destroy() in OnOK does that } -extern wxString AudacityMessageBoxCaptionStr() -{ - return _("Message"); -} - void AudacityTextEntryDialog::SetInsertionPointEnd() { mSetInsertionPointEnd = true; diff --git a/src/widgets/ErrorDialog.h b/src/widgets/ErrorDialog.h index 445382423..a109175fd 100644 --- a/src/widgets/ErrorDialog.h +++ b/src/widgets/ErrorDialog.h @@ -58,19 +58,6 @@ void ShowModelessErrorDialog(wxWindow *parent, const wxString &helpPage, bool Close = true); -extern wxString AudacityMessageBoxCaptionStr(); - -// Do not use wxMessageBox!! Its default window title does not translate! -inline int AudacityMessageBox(const wxString& message, - const wxString& caption = AudacityMessageBoxCaptionStr(), - long style = wxOK | wxCENTRE, - wxWindow *parent = NULL, - int x = wxDefaultCoord, int y = wxDefaultCoord) -{ - return ::wxMessageBox(message, caption, style, parent, x, y); -} - - #include // to inherit /**************************************************************************//** diff --git a/src/widgets/valnum.cpp b/src/widgets/valnum.cpp index 626f82638..5abf09375 100644 --- a/src/widgets/valnum.cpp +++ b/src/widgets/valnum.cpp @@ -27,7 +27,8 @@ #include // for wxUSE_* macros -#include "ErrorDialog.h" +#include "AudacityMessageBox.h" +#include "../Internat.h" #ifdef __BORLANDC__ #pragma hdrstop diff --git a/win/Projects/Audacity/Audacity.vcxproj b/win/Projects/Audacity/Audacity.vcxproj index c96091b43..e8f555f5f 100755 --- a/win/Projects/Audacity/Audacity.vcxproj +++ b/win/Projects/Audacity/Audacity.vcxproj @@ -400,6 +400,7 @@ + @@ -762,6 +763,7 @@ + diff --git a/win/Projects/Audacity/Audacity.vcxproj.filters b/win/Projects/Audacity/Audacity.vcxproj.filters index 67047361f..3b0f10e89 100755 --- a/win/Projects/Audacity/Audacity.vcxproj.filters +++ b/win/Projects/Audacity/Audacity.vcxproj.filters @@ -602,6 +602,9 @@ src\widgets + + src\widgets + src\widgets @@ -1669,6 +1672,9 @@ src\widgets + + src\widgets + src\widgets