From f8c40dc8e73585ecddbfbd033c96347a9eef4671 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Wed, 12 Jun 2019 23:51:23 -0400
Subject: [PATCH] Move DoHelpWelcome out of HelpMenus

---
 src/AudacityApp.cpp     | 2 +-
 src/Menus.h             | 5 -----
 src/SplashDialog.cpp    | 7 +++++++
 src/SplashDialog.h      | 3 +++
 src/menus/HelpMenus.cpp | 7 +------
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/AudacityApp.cpp b/src/AudacityApp.cpp
index 602dad5bf..d1d743344 100644
--- a/src/AudacityApp.cpp
+++ b/src/AudacityApp.cpp
@@ -1544,7 +1544,7 @@ bool AudacityApp::OnInit()
       // Mainly this is to tell users of ALPHAS who don't know that they have an ALPHA.
       // Disabled for now, after discussion.
       // project->MayCheckForUpdates();
-      HelpActions::DoHelpWelcome(*project);
+      SplashDialog::DoHelpWelcome(*project);
    }
 
    #ifdef USE_FFMPEG
diff --git a/src/Menus.h b/src/Menus.h
index dd7c38d58..411acba11 100644
--- a/src/Menus.h
+++ b/src/Menus.h
@@ -132,9 +132,4 @@ void DoTogglePinnedHead( AudacityProject & );
 void DoRecord( AudacityProject & );
 }
 
-/// Namespace for functions for Help menu
-namespace HelpActions {
-void DoHelpWelcome( AudacityProject & );
-}
-
 #endif
diff --git a/src/SplashDialog.cpp b/src/SplashDialog.cpp
index 0f0aac5b1..212670d88 100644
--- a/src/SplashDialog.cpp
+++ b/src/SplashDialog.cpp
@@ -26,6 +26,7 @@ most commonly asked questions about Audacity.
 #include "Experimental.h"
 
 #include <wx/dialog.h>
+#include <wx/frame.h>
 #include <wx/html/htmlwin.h>
 #include <wx/button.h>
 #include <wx/dcclient.h>
@@ -35,6 +36,7 @@ most commonly asked questions about Audacity.
 #include <wx/image.h>
 
 #include "FileNames.h"
+#include "Project.h"
 #include "ShuttleGui.h"
 #include "widgets/AudacityMessageBox.h"
 #include "widgets/LinkingHtmlWindow.h"
@@ -64,6 +66,11 @@ END_EVENT_TABLE()
 
 IMPLEMENT_CLASS(SplashDialog, wxDialogWrapper)
 
+void SplashDialog::DoHelpWelcome( AudacityProject &project )
+{
+   Show2( &GetProjectFrame( project ) );
+}
+
 SplashDialog::SplashDialog(wxWindow * parent)
    :  wxDialogWrapper(parent, -1, _("Welcome to Audacity!"),
       wxPoint( -1, 60 ), // default x position, y position 60 pixels from top of screen.
diff --git a/src/SplashDialog.h b/src/SplashDialog.h
index 3b8e148f4..9a9478dde 100644
--- a/src/SplashDialog.h
+++ b/src/SplashDialog.h
@@ -21,6 +21,9 @@ class HtmlWindow;
 class SplashDialog final : public wxDialogWrapper {
    DECLARE_DYNAMIC_CLASS(SplashDialog)
 public:
+
+   static void DoHelpWelcome( AudacityProject &project );
+
    SplashDialog(wxWindow * parent);
    virtual ~ SplashDialog();
    void OnOK(wxCommandEvent & event);
diff --git a/src/menus/HelpMenus.cpp b/src/menus/HelpMenus.cpp
index e9d0577b6..4ccccefef 100644
--- a/src/menus/HelpMenus.cpp
+++ b/src/menus/HelpMenus.cpp
@@ -282,11 +282,6 @@ namespace HelpActions {
 
 // exported helper functions
 
-void DoHelpWelcome( AudacityProject &project )
-{
-   SplashDialog::Show2( &GetProjectFrame( project ) );
-}
-
 // Menu handler functions
 
 struct Handler : CommandHandlerObject {
@@ -396,7 +391,7 @@ void MayCheckForUpdates(AudacityProject &project)
 
 void OnHelpWelcome(const CommandContext &context)
 {
-   DoHelpWelcome( context.project );
+   SplashDialog::DoHelpWelcome( context.project );
 }
 
 #endif