From e845bd9544031d5e099401c95bb5c6e11d7601b7 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Fri, 26 Apr 2019 09:04:56 -0400
Subject: [PATCH] Move AudacityApp::MacActivateApp out of WindowMenus.cpp

---
 mac/Audacity.xcodeproj/project.pbxproj |  4 ++++
 src/AudacityApp.mm                     | 23 +++++++++++++++++++++++
 src/menus/WindowMenus.cpp              | 10 ----------
 3 files changed, 27 insertions(+), 10 deletions(-)
 create mode 100644 src/AudacityApp.mm

diff --git a/mac/Audacity.xcodeproj/project.pbxproj b/mac/Audacity.xcodeproj/project.pbxproj
index 79ee98af8..7cb4245cc 100644
--- a/mac/Audacity.xcodeproj/project.pbxproj
+++ b/mac/Audacity.xcodeproj/project.pbxproj
@@ -1292,6 +1292,7 @@
 		5EF3E662203FE73C006C6882 /* DragCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5EF3E660203FE73C006C6882 /* DragCommand.cpp */; };
 		5EF958851DEB121800191280 /* InconsistencyException.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5EF958831DEB121800191280 /* InconsistencyException.cpp */; };
 		5EFEAD9E22723E390077DFF6 /* Clipboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5EFEAD9C22723E390077DFF6 /* Clipboard.cpp */; };
+		5EFEADA02273382D0077DFF6 /* AudacityApp.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5EFEAD9F2273382D0077DFF6 /* AudacityApp.mm */; };
 		65326EC72253D70900844F28 /* common.c in Sources */ = {isa = PBXBuildFile; fileRef = 65326EAA2253D70900844F28 /* common.c */; };
 		65326EC82253D70900844F28 /* common.h in Headers */ = {isa = PBXBuildFile; fileRef = 65326EAB2253D70900844F28 /* common.h */; };
 		65326EC92253D70900844F28 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 65326EAC2253D70900844F28 /* config.h */; };
@@ -3324,6 +3325,7 @@
 		5EF958841DEB121800191280 /* InconsistencyException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InconsistencyException.h; sourceTree = "<group>"; };
 		5EFEAD9C22723E390077DFF6 /* Clipboard.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Clipboard.cpp; sourceTree = "<group>"; };
 		5EFEAD9D22723E390077DFF6 /* Clipboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Clipboard.h; sourceTree = "<group>"; };
+		5EFEAD9F2273382D0077DFF6 /* AudacityApp.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AudacityApp.mm; sourceTree = "<group>"; };
 		65326E9E2253D2BE00844F28 /* libmp3lame.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libmp3lame.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		65326EA72253D68900844F28 /* libmpg123.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libmpg123.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		65326EA92253D70900844F28 /* AUTHORS */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = AUTHORS; sourceTree = "<group>"; };
@@ -4489,6 +4491,7 @@
 				2844163A1B82D6BC0000574D /* WaveTrackLocation.h */,
 				28FC1AFA0A47762C00A188AE /* WrappedType.h */,
 				5ED18DB71CC290AB00FAFE95 /* wxFileNameWrapper.h */,
+				5EFEAD9F2273382D0077DFF6 /* AudacityApp.mm */,
 				1790AFDC09883BFD008A330A /* blockfile */,
 				174D9025098C78AF00D5909F /* commands */,
 				1790AFFD09883BFD008A330A /* effects */,
@@ -8233,6 +8236,7 @@
 				5E15125C1DB000DC00702E29 /* LabelTrackVRulerControls.cpp in Sources */,
 				1790B12509883BFD008A330A /* SimpleBlockFile.cpp in Sources */,
 				1790B12609883BFD008A330A /* BlockFile.cpp in Sources */,
+				5EFEADA02273382D0077DFF6 /* AudacityApp.mm in Sources */,
 				1790B12A09883BFD008A330A /* CrossFade.cpp in Sources */,
 				1790B12B09883BFD008A330A /* DirManager.cpp in Sources */,
 				1790B12C09883BFD008A330A /* Dither.cpp in Sources */,
diff --git a/src/AudacityApp.mm b/src/AudacityApp.mm
new file mode 100644
index 000000000..2dbe7e763
--- /dev/null
+++ b/src/AudacityApp.mm
@@ -0,0 +1,23 @@
+#ifdef __WXMAC__
+
+#include "AudacityApp.h"
+
+#include <AppKit/NSApplication.h>
+
+// One Mac-only method of class AudacityApp that uses Objective-C is kept
+// here so that AudacityApp.cpp can be just C++
+
+// The function is not presently used.  See commit
+// a05d039055909d7d1dc2d4f31e1fe0659a3207dd
+// whih added this function, and later commit
+// e359383d3bebd583b894c9ee9d02cce2be318b56
+// which made it unused.  Maybe it will need future use.
+
+void AudacityApp::MacActivateApp()
+{
+   id app = [NSApplication sharedApplication];
+   if ( [app respondsToSelector:@selector(activateIgnoringOtherApps:)] )
+      [app activateIgnoringOtherApps:YES];
+}
+
+#endif
diff --git a/src/menus/WindowMenus.cpp b/src/menus/WindowMenus.cpp
index 0f03be789..c56029e09 100644
--- a/src/menus/WindowMenus.cpp
+++ b/src/menus/WindowMenus.cpp
@@ -7,7 +7,6 @@
 
 #ifdef __WXMAC__
 
-#include "../AudacityApp.h"
 #include "../Menus.h"
 #include "../Project.h"
 #include "../commands/CommandContext.h"
@@ -160,15 +159,6 @@ MenuTable::BaseItemPtr ExtraWindowItems( AudacityProject & )
 #undef XXO
 #undef FN
 
-// One more Objective C++ function for another class scope, kept in this file
-
-void AudacityApp::MacActivateApp()
-{
-   id app = [NSApplication sharedApplication];
-   if ( [app respondsToSelector:@selector(activateIgnoringOtherApps:)] )
-      [app activateIgnoringOtherApps:YES];
-}
-
 #else
 
 // Not WXMAC.  Stub functions.