Fewer inclusions of AudacityApp.h

lib-src/mod-nyq-bench/NyqBench.cpp

@@ -22,7 +22,6 @@
 #include <wx/textctrl.h>
 #include <wx/toolbar.h>
 
-#include "AudacityApp.h"
 #include "AudioIO.h"
 #include "LabelTrack.h"
 #include "ModuleManager.h"

mac/Audacity.xcodeproj/project.pbxproj

@@ -2988,6 +2988,7 @@
 		5E74D2E01CC4429700D88B0B /* PlayIndicatorOverlay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlayIndicatorOverlay.h; sourceTree = "<group>"; };
 		5E74D2E11CC4429700D88B0B /* Scrubbing.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Scrubbing.cpp; sourceTree = "<group>"; };
 		5E74D2E21CC4429700D88B0B /* Scrubbing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Scrubbing.h; sourceTree = "<group>"; };
+		5E7838931DE4BBC2003270C0 /* CommandFlag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommandFlag.h; sourceTree = "<group>"; };
 		5E79B33F1D5CC38D001D677D /* ImportGStreamer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ImportGStreamer.cpp; sourceTree = "<group>"; };
 		5E79B3401D5CC38D001D677D /* ImportGStreamer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImportGStreamer.h; sourceTree = "<group>"; };
 		5E94A1B81D1F1C8400A8713A /* wxPanelWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wxPanelWrapper.cpp; sourceTree = "<group>"; };
@@ -3619,6 +3620,7 @@
 				28D53FFD0FD1912A00FA7C75 /* Command.h */,
 				28D53FFF0FD1912A00FA7C75 /* CommandBuilder.h */,
 				28BD8AAB101DF4C600686679 /* CommandDirectory.h */,
+				5E7838931DE4BBC2003270C0 /* CommandFlag.h */,
 				5E4685F81CCA9D84008741F2 /* CommandFunctors.h */,
 				28D540010FD1912A00FA7C75 /* CommandHandler.h */,
 				174D9027098C78AF00D5909F /* CommandManager.h */,

src/Audacity.h

@@ -174,6 +174,9 @@ void QuitAudacity();
 #define DB_TO_LINEAR(x) (pow(10.0, (x) / 20.0))
 #define LINEAR_TO_DB(x) (20.0 * log10(x))
 
+#define MAX_AUDIO (1. - 1./(1<<15))
+#define JUST_BELOW_MAX_AUDIO (1. - 1./(1<<14))
+
 // Marks strings for extraction only...must use wxGetTranslation() to translate.
 #define XO(s) wxT(s)
 // Marks string for substitution only.

src/AudacityApp.h

@@ -53,133 +53,6 @@ extern bool gIsQuitting;
 // Asynchronous open
 DECLARE_EXPORTED_EVENT_TYPE(AUDACITY_DLL_API, EVT_OPEN_AUDIO_FILE, -1);
 
-// Flags used in command handling.
-
-// These flags represent the majority of the states that affect
-// whether or not items in menus are enabled or disabled.
-enum CommandFlag : unsigned long long
-{
-   AlwaysEnabledFlag      = 0x00000000,
-
-   AudioIONotBusyFlag     = 0x00000001,
-   TimeSelectedFlag       = 0x00000002, // This is equivalent to check if there is a valid selection, so it's used for Zoom to Selection too
-   TracksSelectedFlag     = 0x00000004,
-   TracksExistFlag        = 0x00000008,
-   LabelTracksExistFlag   = 0x00000010,
-   WaveTracksSelectedFlag = 0x00000020,
-   ClipboardFlag          = 0x00000040,
-   TextClipFlag           = 0x00000040, // Same as Clipboard flag for now.
-   UnsavedChangesFlag     = 0x00000080,
-   HasLastEffectFlag      = 0x00000100,
-   UndoAvailableFlag      = 0x00000200,
-   RedoAvailableFlag      = 0x00000400,
-   ZoomInAvailableFlag    = 0x00000800,
-   ZoomOutAvailableFlag   = 0x00001000,
-   StereoRequiredFlag     = 0x00002000,  //lda
-   TopDockHasFocus        = 0x00004000,  //lll
-   TrackPanelHasFocus     = 0x00008000,  //lll
-   BotDockHasFocus        = 0x00010000,  //lll
-   LabelsSelectedFlag     = 0x00020000,
-   AudioIOBusyFlag        = 0x00040000,  //lll
-   PlayRegionLockedFlag   = 0x00080000,  //msmeyer
-   PlayRegionNotLockedFlag= 0x00100000,  //msmeyer
-   CutCopyAvailableFlag   = 0x00200000,
-   WaveTracksExistFlag    = 0x00400000,
-   NoteTracksExistFlag    = 0x00800000,  //gsw
-   NoteTracksSelectedFlag = 0x01000000,  //gsw
-   HaveRecentFiles        = 0x02000000,
-   IsNotSyncLockedFlag    = 0x04000000,  //awd
-   IsSyncLockedFlag       = 0x08000000,  //awd
-   IsRealtimeNotActiveFlag= 0x10000000,  //lll
-   CaptureNotBusyFlag     = 0x20000000,
-   CanStopAudioStreamFlag = 0x40000000,
-   RulerHasFocus          = 0x80000000ULL, // prl
-   NotMinimizedFlag      = 0x100000000ULL, // prl
-   PausedFlag            = 0x200000000ULL, // jkc
-   NotPausedFlag         = 0x400000000ULL, // jkc
-   HasWaveDataFlag       = 0x800000000ULL, // jkc
-
-   NoFlagsSpecifed        = ~0ULL
-};
-
-// Prevent accidental misuse with narrower types
-
-bool operator == (CommandFlag, unsigned long) PROHIBITED;
-bool operator == (CommandFlag, long) PROHIBITED;
-bool operator == (unsigned long, CommandFlag) PROHIBITED;
-bool operator == (long, CommandFlag) PROHIBITED;
-
-bool operator != (CommandFlag, unsigned long) PROHIBITED;
-bool operator != (CommandFlag, long) PROHIBITED;
-bool operator != (unsigned long, CommandFlag) PROHIBITED;
-bool operator != (long, CommandFlag) PROHIBITED;
-
-CommandFlag operator & (CommandFlag, unsigned long) PROHIBITED;
-CommandFlag operator & (CommandFlag, long) PROHIBITED;
-CommandFlag operator & (unsigned long, CommandFlag) PROHIBITED;
-CommandFlag operator & (long, CommandFlag) PROHIBITED;
-
-CommandFlag operator | (CommandFlag, unsigned long) PROHIBITED;
-CommandFlag operator | (CommandFlag, long) PROHIBITED;
-CommandFlag operator | (unsigned long, CommandFlag) PROHIBITED;
-CommandFlag operator | (long, CommandFlag) PROHIBITED;
-
-CommandFlag operator ^ (CommandFlag, unsigned long) PROHIBITED;
-CommandFlag operator ^ (CommandFlag, long) PROHIBITED;
-CommandFlag operator ^ (unsigned long, CommandFlag) PROHIBITED;
-CommandFlag operator ^ (long, CommandFlag) PROHIBITED;
-
-bool operator == (CommandFlag, unsigned int) PROHIBITED;
-bool operator == (CommandFlag, int) PROHIBITED;
-bool operator == (unsigned int, CommandFlag) PROHIBITED;
-bool operator == (int, CommandFlag) PROHIBITED;
-
-bool operator != (CommandFlag, unsigned int) PROHIBITED;
-bool operator != (CommandFlag, int) PROHIBITED;
-bool operator != (unsigned int, CommandFlag) PROHIBITED;
-bool operator != (int, CommandFlag) PROHIBITED;
-
-CommandFlag operator & (CommandFlag, unsigned int) PROHIBITED;
-CommandFlag operator & (CommandFlag, int) PROHIBITED;
-CommandFlag operator & (unsigned int, CommandFlag) PROHIBITED;
-CommandFlag operator & (int, CommandFlag) PROHIBITED;
-
-CommandFlag operator | (CommandFlag, unsigned int) PROHIBITED;
-CommandFlag operator | (CommandFlag, int) PROHIBITED;
-CommandFlag operator | (unsigned int, CommandFlag) PROHIBITED;
-CommandFlag operator | (int, CommandFlag) PROHIBITED;
-
-CommandFlag operator ^ (CommandFlag, unsigned int) PROHIBITED;
-CommandFlag operator ^ (CommandFlag, int) PROHIBITED;
-CommandFlag operator ^ (unsigned int, CommandFlag) PROHIBITED;
-CommandFlag operator ^ (int, CommandFlag) PROHIBITED;
-
-// Supply the bitwise operations
-
-inline CommandFlag operator ~ (CommandFlag flag)
-{
-   return static_cast<CommandFlag>( ~ static_cast<unsigned long long> (flag) );
-}
-inline CommandFlag operator & (CommandFlag lhs, CommandFlag rhs)
-{
-   return static_cast<CommandFlag> (
-      static_cast<unsigned long long>(lhs) & static_cast<unsigned long long>(rhs)
-   );
-}
-inline CommandFlag operator | (CommandFlag lhs, CommandFlag rhs)
-{
-   return static_cast<CommandFlag> (
-      static_cast<unsigned long long>(lhs) | static_cast<unsigned long long>(rhs)
-   );
-}
-inline CommandFlag & operator |= (CommandFlag &lhs, CommandFlag rhs)
-{
-   lhs = lhs | rhs;
-   return lhs;
-}
-
-using CommandMask = CommandFlag;
-
 class BlockFile;
 class AliasBlockFile;
 
@@ -335,6 +208,3 @@ class AudacityApp final : public wxApp {
 extern AudacityApp & wxGetApp();
 
 #endif
-
-#define MAX_AUDIO (1. - 1./(1<<15))
-#define JUST_BELOW_MAX_AUDIO (1. - 1./(1<<14))

src/AutoRecovery.cpp

@@ -16,7 +16,6 @@ recover previous Audacity projects that were closed incorrectly.
 
 #include "AutoRecovery.h"
 #include "Audacity.h"
-#include "AudacityApp.h"
 #include "FileNames.h"
 #include "blockfile/SimpleBlockFile.h"
 #include "Sequence.h"

src/BatchCommands.cpp

@@ -25,6 +25,7 @@ See also BatchCommandDialog and BatchProcessDialog.
 #include <wx/filedlg.h>
 #include <wx/textfile.h>
 
+#include "AudacityApp.h"
 #include "Project.h"
 #include "commands/CommandManager.h"
 #include "effects/EffectManager.h"

src/Benchmark.cpp

@@ -18,6 +18,7 @@ of the BlockFile system.
 #include "Audacity.h"
 #include "Benchmark.h"
 
+#include <wx/app.h>
 #include <wx/log.h>
 #include <wx/textctrl.h>
 #include <wx/button.h>

src/FFmpeg.cpp

@@ -19,7 +19,6 @@ License: GPL v2.  See License.txt.
 
 #include "Audacity.h"   // for config*.h
 #include "FFmpeg.h"
-#include "AudacityApp.h"
 #include "FileNames.h"
 #include "Internat.h"
 #include "widgets/HelpSystem.h"

src/HistoryWindow.cpp

@@ -18,6 +18,7 @@ undo memory so as to free up space.
 
 #include "Audacity.h"
 
+#include <wx/app.h>
 #include <wx/defs.h>
 #include <wx/button.h>
 #include <wx/dialog.h>

src/Makefile.am

@@ -261,6 +261,7 @@ audacity_SOURCES = \
 	commands/CommandBuilder.h \
 	commands/CommandDirectory.cpp \
 	commands/CommandDirectory.h \
+	commands/CommandFlag.h \
 	commands/CommandFunctors.h \
 	commands/CommandHandler.cpp \
 	commands/CommandHandler.h \

src/MenusMac.cpp

@@ -10,6 +10,7 @@
 // Objective-C++ .  Avoid mixing languages elsewhere.
 
 #include "Audacity.h"
+#include "AudacityApp.h"
 #include "Project.h"
 
 #undef USE_COCOA

src/PlatformCompatibility.cpp

@@ -21,7 +21,6 @@
 #include <wx/stdpaths.h>
 #include <wx/app.h>
 
-#include "AudacityApp.h"
 #include "PlatformCompatibility.h"
 
 wxString PlatformCompatibility::GetLongFileName(const wxString& shortFileName)

src/PluginManager.cpp

@@ -35,7 +35,6 @@
 
 #include "audacity/EffectInterface.h"
 
-#include "AudacityApp.h"
 #include "FileNames.h"
 #include "ModuleManager.h"
 #include "PlatformCompatibility.h"

src/Project.h

@@ -53,6 +53,7 @@ class wxBoxSizer;
 class wxScrollEvent;
 class wxScrollBar;
 class wxPanel;
+class wxTimerEvent;
 
 class AudacityProject;
 class AutoSaveFile;

src/TimerRecordDialog.cpp

@@ -23,6 +23,7 @@
 #include "FileNames.h"
 
 #include <wx/defs.h>
+#include <wx/dir.h>
 #include <wx/datetime.h>
 #include <wx/intl.h>
 #include <wx/progdlg.h>

src/TrackArtist.cpp

@@ -144,7 +144,6 @@ audio tracks.
 
 #include "Audacity.h"
 #include "TrackArtist.h"
-#include "AudacityApp.h"
 #include "float_cast.h"
 
 #include <math.h>

src/blockfile/PCMAliasBlockFile.cpp

@@ -18,6 +18,7 @@
 
 #include <sndfile.h>
 
+#include "../AudacityApp.h"
 #include "../FileFormats.h"
 #include "../Internat.h"
 #include "../MemoryX.h"

src/commands/CommandFlag.h

@@ -0,0 +1,141 @@
+//
+//  CommandFlag.h
+//  Audacity
+//
+//  Created by Paul Licameli on 11/22/16.
+//
+//
+
+#ifndef __AUDACITY_COMMAND_FLAG__
+#define __AUDACITY_COMMAND_FLAG__
+
+// Flags used in command handling.
+
+// These flags represent the majority of the states that affect
+// whether or not items in menus are enabled or disabled.
+enum CommandFlag : unsigned long long
+{
+   AlwaysEnabledFlag      = 0x00000000,
+
+   AudioIONotBusyFlag     = 0x00000001,
+   TimeSelectedFlag       = 0x00000002, // This is equivalent to check if there is a valid selection, so it's used for Zoom to Selection too
+   TracksSelectedFlag     = 0x00000004,
+   TracksExistFlag        = 0x00000008,
+   LabelTracksExistFlag   = 0x00000010,
+   WaveTracksSelectedFlag = 0x00000020,
+   ClipboardFlag          = 0x00000040,
+   TextClipFlag           = 0x00000040, // Same as Clipboard flag for now.
+   UnsavedChangesFlag     = 0x00000080,
+   HasLastEffectFlag      = 0x00000100,
+   UndoAvailableFlag      = 0x00000200,
+   RedoAvailableFlag      = 0x00000400,
+   ZoomInAvailableFlag    = 0x00000800,
+   ZoomOutAvailableFlag   = 0x00001000,
+   StereoRequiredFlag     = 0x00002000,  //lda
+   TopDockHasFocus        = 0x00004000,  //lll
+   TrackPanelHasFocus     = 0x00008000,  //lll
+   BotDockHasFocus        = 0x00010000,  //lll
+   LabelsSelectedFlag     = 0x00020000,
+   AudioIOBusyFlag        = 0x00040000,  //lll
+   PlayRegionLockedFlag   = 0x00080000,  //msmeyer
+   PlayRegionNotLockedFlag= 0x00100000,  //msmeyer
+   CutCopyAvailableFlag   = 0x00200000,
+   WaveTracksExistFlag    = 0x00400000,
+   NoteTracksExistFlag    = 0x00800000,  //gsw
+   NoteTracksSelectedFlag = 0x01000000,  //gsw
+   HaveRecentFiles        = 0x02000000,
+   IsNotSyncLockedFlag    = 0x04000000,  //awd
+   IsSyncLockedFlag       = 0x08000000,  //awd
+   IsRealtimeNotActiveFlag= 0x10000000,  //lll
+   CaptureNotBusyFlag     = 0x20000000,
+   CanStopAudioStreamFlag = 0x40000000,
+   RulerHasFocus          = 0x80000000ULL, // prl
+   NotMinimizedFlag      = 0x100000000ULL, // prl
+   PausedFlag            = 0x200000000ULL, // jkc
+   NotPausedFlag         = 0x400000000ULL, // jkc
+   HasWaveDataFlag       = 0x800000000ULL, // jkc
+
+   NoFlagsSpecifed        = ~0ULL
+};
+
+// Prevent accidental misuse with narrower types
+
+bool operator == (CommandFlag, unsigned long) PROHIBITED;
+bool operator == (CommandFlag, long) PROHIBITED;
+bool operator == (unsigned long, CommandFlag) PROHIBITED;
+bool operator == (long, CommandFlag) PROHIBITED;
+
+bool operator != (CommandFlag, unsigned long) PROHIBITED;
+bool operator != (CommandFlag, long) PROHIBITED;
+bool operator != (unsigned long, CommandFlag) PROHIBITED;
+bool operator != (long, CommandFlag) PROHIBITED;
+
+CommandFlag operator & (CommandFlag, unsigned long) PROHIBITED;
+CommandFlag operator & (CommandFlag, long) PROHIBITED;
+CommandFlag operator & (unsigned long, CommandFlag) PROHIBITED;
+CommandFlag operator & (long, CommandFlag) PROHIBITED;
+
+CommandFlag operator | (CommandFlag, unsigned long) PROHIBITED;
+CommandFlag operator | (CommandFlag, long) PROHIBITED;
+CommandFlag operator | (unsigned long, CommandFlag) PROHIBITED;
+CommandFlag operator | (long, CommandFlag) PROHIBITED;
+
+CommandFlag operator ^ (CommandFlag, unsigned long) PROHIBITED;
+CommandFlag operator ^ (CommandFlag, long) PROHIBITED;
+CommandFlag operator ^ (unsigned long, CommandFlag) PROHIBITED;
+CommandFlag operator ^ (long, CommandFlag) PROHIBITED;
+
+bool operator == (CommandFlag, unsigned int) PROHIBITED;
+bool operator == (CommandFlag, int) PROHIBITED;
+bool operator == (unsigned int, CommandFlag) PROHIBITED;
+bool operator == (int, CommandFlag) PROHIBITED;
+
+bool operator != (CommandFlag, unsigned int) PROHIBITED;
+bool operator != (CommandFlag, int) PROHIBITED;
+bool operator != (unsigned int, CommandFlag) PROHIBITED;
+bool operator != (int, CommandFlag) PROHIBITED;
+
+CommandFlag operator & (CommandFlag, unsigned int) PROHIBITED;
+CommandFlag operator & (CommandFlag, int) PROHIBITED;
+CommandFlag operator & (unsigned int, CommandFlag) PROHIBITED;
+CommandFlag operator & (int, CommandFlag) PROHIBITED;
+
+CommandFlag operator | (CommandFlag, unsigned int) PROHIBITED;
+CommandFlag operator | (CommandFlag, int) PROHIBITED;
+CommandFlag operator | (unsigned int, CommandFlag) PROHIBITED;
+CommandFlag operator | (int, CommandFlag) PROHIBITED;
+
+CommandFlag operator ^ (CommandFlag, unsigned int) PROHIBITED;
+CommandFlag operator ^ (CommandFlag, int) PROHIBITED;
+CommandFlag operator ^ (unsigned int, CommandFlag) PROHIBITED;
+CommandFlag operator ^ (int, CommandFlag) PROHIBITED;
+
+// Supply the bitwise operations
+
+inline CommandFlag operator ~ (CommandFlag flag)
+{
+   return static_cast<CommandFlag>( ~ static_cast<unsigned long long> (flag) );
+}
+inline CommandFlag operator & (CommandFlag lhs, CommandFlag rhs)
+{
+   return static_cast<CommandFlag> (
+      static_cast<unsigned long long>(lhs) &
+      static_cast<unsigned long long>(rhs)
+   );
+}
+inline CommandFlag operator | (CommandFlag lhs, CommandFlag rhs)
+{
+   return static_cast<CommandFlag> (
+      static_cast<unsigned long long>(lhs) |
+      static_cast<unsigned long long>(rhs)
+   );
+}
+inline CommandFlag & operator |= (CommandFlag &lhs, CommandFlag rhs)
+{
+   lhs = lhs | rhs;
+   return lhs;
+}
+
+using CommandMask = CommandFlag;
+
+#endif

src/commands/CommandHandler.h

@@ -17,7 +17,7 @@
 #define __COMMANDHANDLER__
 
 #include "../MemoryX.h"
-#include "../AudacityApp.h"
+class AudacityApp;
 class AudacityProject;
 class AppCommandEvent;
 class CommandExecutionContext;

src/commands/CommandManager.cpp

@@ -79,13 +79,13 @@ CommandManager.  It holds the callback for one command.
 #include "CommandManager.h"
 
 #include <wx/defs.h>
+#include <wx/eventfilter.h>
 #include <wx/hash.h>
 #include <wx/intl.h>
 #include <wx/log.h>
 #include <wx/msgdlg.h>
 #include <wx/tokenzr.h>
 
-#include "../AudacityApp.h"
 #include "../Prefs.h"
 #include "../Project.h"
 

src/commands/CommandManager.h

@@ -15,6 +15,7 @@
 #include "../Experimental.h"
 
 #include "CommandFunctors.h"
+#include "CommandFlag.h"
 
 #include "../MemoryX.h"
 #include <vector>
@@ -23,7 +24,6 @@
 #include <wx/menu.h>
 #include <wx/hashmap.h>
 
-#include "../AudacityApp.h"
 #include "../xml/XMLTagHandler.h"
 
 #include "audacity/Types.h"

src/commands/ScreenshotCommand.cpp

@@ -17,7 +17,6 @@ project window.
 
 #include "ScreenshotCommand.h"
 #include "CommandTargets.h"
-#include "../AudacityApp.h"
 #include "../Project.h"
 #include <wx/toplevel.h>
 #include <wx/dcscreen.h>
@@ -143,11 +142,11 @@ wxRect ScreenshotCommand::GetBackgroundRect()
 static void Yield()
 {
    int cnt;
-   for (cnt = 10; cnt && !wxGetApp().Yield(true); cnt--) {
+   for (cnt = 10; cnt && !wxTheApp->Yield(true); cnt--) {
       wxMilliSleep(10);
    }
    wxMilliSleep(200);
-   for (cnt = 10; cnt && !wxGetApp().Yield(true); cnt--) {
+   for (cnt = 10; cnt && !wxTheApp->Yield(true); cnt--) {
       wxMilliSleep(10);
    }
 }

src/effects/Contrast.cpp

@@ -12,8 +12,6 @@
 #include "../Audacity.h"
 #include "Contrast.h"
 
-#include "../AudacityApp.h"
-
 #include "../WaveTrack.h"
 #include "../Prefs.h"
 #include "../Project.h"

src/effects/FindClipping.cpp

@@ -26,7 +26,6 @@
 
 #include <wx/intl.h>
 
-#include "../AudacityApp.h"
 #include "../ShuttleGui.h"
 #include "../widgets/valnum.h"
 

src/effects/NoiseRemoval.cpp

@@ -77,7 +77,6 @@
 #include <wx/valtext.h>
 
 
-#include "../AudacityApp.h"
 #include "../PlatformCompatibility.h"
 
 EffectNoiseRemoval::EffectNoiseRemoval()

src/effects/lv2/LoadLV2.cpp

@@ -30,7 +30,6 @@ Functions that find and load all LV2 plugins on the system.
 #include <wx/log.h>
 #include <wx/string.h>
 
-#include "../../AudacityApp.h"
 #include "../../Internat.h"
 #include "../EffectManager.h"
 

src/export/ExportCL.cpp

@@ -15,6 +15,7 @@
 #include "ExportCL.h"
 #include "../Project.h"
 
+#include <wx/app.h>
 #include <wx/button.h>
 #include <wx/combobox.h>
 #include <wx/log.h>

src/export/ExportMP3.cpp

@@ -62,6 +62,7 @@
 #include "../Audacity.h"
 #include "ExportMP3.h"
 
+#include <wx/app.h>
 #include <wx/defs.h>
 
 #include <wx/choice.h>

src/import/ImportPCM.cpp

@@ -21,7 +21,6 @@
 
 #include "../Audacity.h"
 #include "ImportPCM.h"
-#include "../AudacityApp.h"
 #include "../Internat.h"
 #include "../Tags.h"
 

src/prefs/EffectsPrefs.cpp

@@ -19,9 +19,9 @@
 
 #include "../Audacity.h"
 
+#include <wx/choice.h>
 #include <wx/defs.h>
 
-#include "../AudacityApp.h"
 #include "../Languages.h"
 #include "../PluginManager.h"
 #include "../Prefs.h"

src/prefs/ExtImportPrefs.cpp

@@ -23,7 +23,6 @@
 #include <wx/dnd.h>
 
 #include "../Audacity.h"
-#include "../AudacityApp.h"
 #include "../Prefs.h"
 #include "../ShuttleGui.h"
 

src/toolbars/DeviceToolBar.cpp

@@ -30,8 +30,6 @@
 #include <wx/tooltip.h>
 #endif
 
-#include "../AudacityApp.h"
-
 #include "ToolDock.h"
 #include "../TrackPanel.h"
 

src/toolbars/MixerToolBar.cpp

@@ -31,7 +31,6 @@
 
 #include "MixerToolBar.h"
 
-#include "../AudacityApp.h"
 #include "../AColor.h"
 #include "../AllThemeResources.h"
 #include "../AudioIO.h"

src/toolbars/SpectralSelectionBar.cpp

@@ -51,7 +51,6 @@ with changes in the SpectralSelectionBar.
 #include "SpectralSelectionBarListener.h"
 #include "SpectralSelectionBar.h"
 
-#include "../AudacityApp.h"
 #include "../Prefs.h"
 #include "../SelectedRegion.h"
 #include "../widgets/NumericTextCtrl.h"

src/toolbars/TranscriptionToolBar.cpp

@@ -31,7 +31,6 @@
 #include "../Envelope.h"
 
 #include "ControlToolBar.h"
-#include "../AudacityApp.h"
 #include "../AllThemeResources.h"
 #include "../AudioIO.h"
 #include "../Experimental.h"

src/tracks/ui/Scrubbing.cpp

@@ -33,6 +33,7 @@ Paul Licameli split from TrackPanel.cpp
 
 #include <algorithm>
 
+#include <wx/app.h>
 #include <wx/dc.h>
 
 // Yet another experimental scrub would drag the track under a

src/widgets/AButton.cpp

@@ -26,10 +26,12 @@
 #include "AButton.h"
 #include "../AColor.h"
 
+#include <wx/app.h>
 #include <wx/dcclient.h>
 #include <wx/dcmemory.h>
 #include <wx/dcbuffer.h>
 #include <wx/image.h>
+#include <wx/timer.h>
 
 //This is needed for tooltips
 #include "../Project.h"

src/widgets/KeyView.cpp

@@ -24,6 +24,7 @@
 #include "KeyView.h"
 
 #include <wx/arrimpl.cpp>
+#include <wx/dc.h>
 
 // Various drawing constants
 #define KV_BITMAP_SIZE 16

src/widgets/Meter.cpp

@@ -40,9 +40,9 @@
 
 #include "../Audacity.h"
 #include "Meter.h"
-#include "../AudacityApp.h"
 
 #include <algorithm>
+#include <wx/app.h>
 #include <wx/defs.h>
 #include <wx/dialog.h>
 #include <wx/dcbuffer.h>

src/widgets/MultiDialog.cpp

@@ -23,6 +23,7 @@ for each problem encountered, since there can be many orphans.
 
 #include "MultiDialog.h"
 
+#include <wx/app.h>
 #include <wx/button.h>
 #include <wx/dialog.h>
 #include <wx/intl.h>
@@ -160,7 +161,7 @@ int ShowMultiDialog(const wxString &message,
    const wxString &title,
    const wxChar **buttons, const wxString &boxMsg, bool log)
 {
-   wxWindow * pParent = wxGetApp().GetTopWindow();
+   wxWindow * pParent = wxTheApp->GetTopWindow();
 
    // We want a parent we can display over, so don't make it a parent if top
    // window is a STAY_ON_TOP.

src/widgets/NumericTextCtrl.cpp

@@ -168,7 +168,6 @@ different formats.
 #include "../Audacity.h"
 #include "NumericTextCtrl.h"
 #include "audacity/Types.h"
-#include "../AudacityApp.h"
 #include "../Theme.h"
 #include "../AllThemeResources.h"
 #include "../AColor.h"

src/widgets/Ruler.cpp

@@ -58,6 +58,7 @@ array of Ruler::Label.
 
 #include <math.h>
 
+#include <wx/app.h>
 #include <wx/dcscreen.h>
 #include <wx/dcmemory.h>
 #include <wx/dcbuffer.h>

win/Projects/Audacity/Audacity.vcxproj

@@ -421,6 +421,7 @@
     <ClInclude Include="..\..\..\src\BatchProcessDialog.h" />
     <ClInclude Include="..\..\..\src\Benchmark.h" />
     <ClInclude Include="..\..\..\src\BlockFile.h" />
+    <ClInclude Include="..\..\..\src\commands\CommandFlag.h" />
     <ClInclude Include="..\..\..\src\commands\CommandFunctors.h" />
     <ClInclude Include="..\..\..\src\commands\OpenSaveCommands.h" />
     <ClInclude Include="..\..\..\src\DeviceChange.h" />

win/Projects/Audacity/Audacity.vcxproj.filters

@@ -1798,6 +1798,9 @@
     <ClInclude Include="..\..\..\src\import\ImportForwards.h">
       <Filter>src\import</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\src\commands\CommandFlag.h">
+      <Filter>src\commands</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Image Include="..\..\audacity.ico">