Move AudacityMessageBox to its own files...

... breaking cycles among low-level files introduced by 273ba9f
This commit is contained in:
Paul Licameli 2019-05-20 14:27:11 -04:00
parent 273ba9f64d
commit f86403378b
92 changed files with 182 additions and 87 deletions

View File

@ -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"

View File

@ -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

View File

@ -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 = "<group>"; };
5E15126C1DB0010C00702E29 /* TrackVRulerControls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TrackVRulerControls.h; sourceTree = "<group>"; };
5E16FF4C1FF9CE0B0085E1B8 /* LanguageNames.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = LanguageNames.txt; path = ../locale/LanguageNames.txt; sourceTree = "<group>"; };
5E18CFF122931CA900E75250 /* AudacityMessageBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudacityMessageBox.h; sourceTree = "<group>"; };
5E18CFF222931D3D00E75250 /* AudacityMessageBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AudacityMessageBox.cpp; sourceTree = "<group>"; };
5E19D64C217D51190024D0B1 /* PluginMenus.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PluginMenus.cpp; path = menus/PluginMenus.cpp; sourceTree = "<group>"; };
5E2A19921EED688500217B58 /* SelectionState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SelectionState.cpp; sourceTree = "<group>"; };
5E2A19931EED688500217B58 /* SelectionState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SelectionState.h; sourceTree = "<group>"; };
@ -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 */,

View File

@ -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"

View File

@ -24,7 +24,7 @@ got to show.
#include <wx/atomic.h>
#include "widgets/ErrorDialog.h"
#include "widgets/AudacityMessageBox.h"
AudacityException::~AudacityException()
{

View File

@ -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 <mutex>
@ -28,9 +29,10 @@ Provides thread-safe logging based on the wxWidgets log facility.
#include <wx/frame.h>
#include <wx/icon.h>
#include <wx/settings.h>
#include <wx/textctrl.h>
#include "../images/AudacityLogoAlpha.xpm"
#include "widgets/ErrorDialog.h"
#include "widgets/AudacityMessageBox.h"
//
// AudacityLogger class

View File

@ -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"

View File

@ -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,

View File

@ -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"

View File

@ -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

View File

@ -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
{

View File

@ -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 <unordered_map>

View File

@ -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__)

View File

@ -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 <wx/checkbox.h>
#include <wx/dynlib.h>
#include <wx/file.h>
#include <wx/filedlg.h>
#include <wx/log.h>
#include <wx/textctrl.h>
#if !defined(USE_FFMPEG)
/// FFmpeg support may or may not be compiled in,

View File

@ -21,7 +21,8 @@ information.
#include <wx/arrstr.h>
#include <wx/intl.h>
#include "sndfile.h"
#include "widgets/ErrorDialog.h"
#include "Internat.h"
#include "widgets/AudacityMessageBox.h"
#ifndef SNDFILE_1
#error Requires libsndfile 1.0 or higher

View File

@ -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__)

View File

@ -65,6 +65,7 @@ and in the spectrogram spectral selection.
#include <wx/stattext.h>
#include <wx/statusbr.h>
#include <wx/textctrl.h>
#include <wx/textfile.h>
#include <math.h>
@ -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

View File

@ -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"

View File

@ -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

View File

@ -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:

View File

@ -40,7 +40,7 @@ On failure the old version is put back in place.
#include <wx/string.h>
#include <wx/textfile.h>
#include "widgets/ErrorDialog.h"
#include "widgets/AudacityMessageBox.h"
#include "xml/XMLWriter.h"
static bool ConvertLegacyTrack(wxTextFile *f, XMLFileWriter &xmlFile)

View File

@ -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 \

View File

@ -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

View File

@ -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"

View File

@ -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 <unordered_map>

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -47,7 +47,7 @@
#include "InconsistencyException.h"
#include "widgets/ErrorDialog.h"
#include "widgets/AudacityMessageBox.h"
size_t Sequence::sMaxDiskBlockSize = 1048576;

View File

@ -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"

View File

@ -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"

View File

@ -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.

View File

@ -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"

View File

@ -31,6 +31,7 @@ or "OFF" point
#include <iostream>
#include "WaveTrack.h"
#include "widgets/AudacityMessageBox.h"
#include "widgets/ErrorDialog.h"
using std::cout;

View File

@ -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 <unordered_map>

View File

@ -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"

View File

@ -27,8 +27,10 @@ capture the more lengthy output from some commands.
#include <wx/app.h>
#include <wx/statusbr.h>
#include <wx/string.h>
#include <wx/textctrl.h>
#include "../ShuttleGui.h"
#include "../widgets/ErrorDialog.h"
#include "../widgets/AudacityMessageBox.h"
#include "../widgets/wxPanelWrapper.h"
void CommandMessageTarget::StartArray()
{

View File

@ -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"

View File

@ -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"

View File

@ -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
//

View File

@ -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"

View File

@ -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 <cmath>

View File

@ -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

View File

@ -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"

View File

@ -27,7 +27,7 @@ effects.
#include <wx/stopwatch.h>
#include <wx/tokenzr.h>
#include "../widgets/ErrorDialog.h"
#include "../widgets/AudacityMessageBox.h"
#if defined(EXPERIMENTAL_EFFECTS_RACK)
#include "EffectRack.h"

View File

@ -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"

View File

@ -22,7 +22,7 @@
#include "TimeWarper.h"
#include "../widgets/ErrorDialog.h"
#include "../widgets/AudacityMessageBox.h"
bool Generator::Process()
{

View File

@ -49,7 +49,7 @@
#include "../RealFFTf.h"
#include "../WaveTrack.h"
#include "../widgets/ErrorDialog.h"
#include "../widgets/AudacityMessageBox.h"
#include "../widgets/valnum.h"
#include <algorithm>

View File

@ -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"

View File

@ -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()
{

View File

@ -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"

View File

@ -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:

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -61,7 +61,7 @@
#include "../Project.h"
#include "../Tags.h"
#include "../TranslatableStringArray.h"
#include "../widgets/ErrorDialog.h"
#include "../widgets/AudacityMessageBox.h"
#include "Export.h"

View File

@ -39,7 +39,7 @@ and libvorbis examples, Monty <monty@xiph.org>
#include "../Tags.h"
#include "../widgets/ErrorDialog.h"
#include "../widgets/AudacityMessageBox.h"
#include "../widgets/ProgressDialog.h"
//----------------------------------------------------------------------------

View File

@ -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

View File

@ -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"

View File

@ -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"

View File

@ -34,7 +34,7 @@
#include "../ShuttleGui.h"
#include "../Tags.h"
#include "../widgets/ErrorDialog.h"
#include "../widgets/AudacityMessageBox.h"
#include "../widgets/ProgressDialog.h"
//----------------------------------------------------------------------------

View File

@ -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"

View File

@ -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

View File

@ -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)
{

View File

@ -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")

View File

@ -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 {

View File

@ -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

View File

@ -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"

View File

@ -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 <wx/combobox.h>

View File

@ -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 <float.h>

View File

@ -35,7 +35,7 @@
#include "../FileNames.h"
#include "../Prefs.h"
#include "../ShuttleGui.h"
#include "../widgets/ErrorDialog.h"
#include "../widgets/AudacityMessageBox.h"
enum {
TempDirID = 1000,

View File

@ -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

View File

@ -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);

View File

@ -33,6 +33,7 @@ KeyConfigPrefs and MousePrefs use.
#include <wx/radiobut.h>
#include <wx/stattext.h>
#include <wx/statbox.h>
#include <wx/textctrl.h>
#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"

View File

@ -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"
////////////////////////////////////////////////////////////////////////////////

View File

@ -34,12 +34,13 @@ other settings.
#include <wx/choice.h>
#include <wx/intl.h>
#include <wx/textctrl.h>
#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

View File

@ -24,11 +24,12 @@ Paul Licameli
#include <algorithm>
#include "../FFT.h"
#include "../Internat.h"
#include "../Prefs.h"
#include <cmath>
#include "../widgets/ErrorDialog.h"
#include "../widgets/AudacityMessageBox.h"
SpectrogramSettings::Globals::Globals()
{

View File

@ -23,6 +23,7 @@
#include <wx/defs.h>
#include <wx/intl.h>
#include <wx/checkbox.h>
#include <wx/textctrl.h>
#include "../FFT.h"
#include "../Project.h"
@ -32,7 +33,7 @@
#include <algorithm>
#include "../widgets/ErrorDialog.h"
#include "../widgets/AudacityMessageBox.h"
SpectrumPrefs::SpectrumPrefs(wxWindow * parent, wxWindowID winid, WaveTrack *wt)
: PrefsPanel(parent, winid, wt ? _("Spectrogram Settings") : _("Spectrograms"))

View File

@ -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

View File

@ -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;

View File

@ -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 <wx/combobox.h>
#include <wx/sizer.h>

View File

@ -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");
}

View File

@ -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 <wx/msgdlg.h>
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

View File

@ -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;

View File

@ -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 <wx/textdlg.h> // to inherit
/**************************************************************************//**

View File

@ -27,7 +27,8 @@
#include <wx/setup.h> // for wxUSE_* macros
#include "ErrorDialog.h"
#include "AudacityMessageBox.h"
#include "../Internat.h"
#ifdef __BORLANDC__
#pragma hdrstop

View File

@ -400,6 +400,7 @@
<ClCompile Include="..\..\..\src\widgets\AButton.cpp" />
<ClCompile Include="..\..\..\src\widgets\ASlider.cpp" />
<ClCompile Include="..\..\..\src\widgets\AttachableScrollBar.cpp" />
<ClCompile Include="..\..\..\src\widgets\AudacityMessageBox.cpp" />
<ClCompile Include="..\..\..\src\widgets\ErrorDialog.cpp" />
<ClCompile Include="..\..\..\src\widgets\ExpandingToolBar.cpp" />
<ClCompile Include="..\..\..\src\widgets\FileHistory.cpp" />
@ -762,6 +763,7 @@
<ClInclude Include="..\..\..\src\widgets\AButton.h" />
<ClInclude Include="..\..\..\src\widgets\ASlider.h" />
<ClInclude Include="..\..\..\src\widgets\AttachableScrollBar.h" />
<ClInclude Include="..\..\..\src\widgets\AudacityMessageBox.h" />
<ClInclude Include="..\..\..\src\widgets\ErrorDialog.h" />
<ClInclude Include="..\..\..\src\widgets\ExpandingToolBar.h" />
<ClInclude Include="..\..\..\src\widgets\FileHistory.h" />

View File

@ -602,6 +602,9 @@
<ClCompile Include="..\..\..\src\widgets\AttachableScrollBar.cpp">
<Filter>src\widgets</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\widgets\AudacityMessageBox.cpp">
<Filter>src\widgets</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\widgets\ErrorDialog.cpp">
<Filter>src\widgets</Filter>
</ClCompile>
@ -1669,6 +1672,9 @@
<ClInclude Include="..\..\..\src\widgets\AttachableScrollBar.h">
<Filter>src\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\widgets\AudacityMessageBox.h">
<Filter>src\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\widgets\ErrorDialog.h">
<Filter>src\widgets</Filter>
</ClInclude>