From 3c5468a1c81075ca61dcf3020dadb0814fc6b51f Mon Sep 17 00:00:00 2001
From: James Crook <james.k.crook@gmail.com>
Date: Wed, 14 Feb 2018 21:49:56 +0000
Subject: [PATCH] Add buttons.  Help and Cancel.

---
 src/commands/AudacityCommand.cpp | 15 ++++++++++++++-
 src/commands/AudacityCommand.h   |  1 +
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/commands/AudacityCommand.cpp b/src/commands/AudacityCommand.cpp
index 49f1d3cff..2ed153104 100644
--- a/src/commands/AudacityCommand.cpp
+++ b/src/commands/AudacityCommand.cpp
@@ -52,6 +52,7 @@ ShuttleGui.
 #include "../widgets/LinkingHtmlWindow.h"
 #include "../widgets/ErrorDialog.h"
 #include "../FileNames.h"
+#include "../widgets/HelpSystem.h"
 
 #include "../commands/CommandTargets.h"
 
@@ -256,6 +257,8 @@ int AudacityCommand::MessageBox(const wxString& message, long style, const wxStr
 
 BEGIN_EVENT_TABLE(AudacityCommandDialog, wxDialogWrapper)
    EVT_BUTTON(wxID_OK, AudacityCommandDialog::OnOk)
+   EVT_BUTTON(wxID_HELP, AudacityCommandDialog::OnHelp)
+   EVT_BUTTON(wxID_CANCEL, AudacityCommandDialog::OnCancel)
 END_EVENT_TABLE()
 
 AudacityCommandDialog::AudacityCommandDialog(wxWindow * parent,
@@ -269,7 +272,7 @@ AudacityCommandDialog::AudacityCommandDialog(wxWindow * parent,
    mType = type;
    wxASSERT( pCommand );
    mpCommand = pCommand;
-   mAdditionalButtons = additionalButtons;
+   mAdditionalButtons = additionalButtons |eCancelButton | eHelpButton;
 }
 
 bool AudacityCommandDialog::Init()
@@ -340,3 +343,13 @@ void AudacityCommandDialog::OnCancel(wxCommandEvent & WXUNUSED(evt))
    EndModal(false);
 }
 
+void AudacityCommandDialog::OnHelp(wxCommandEvent & WXUNUSED(event))
+{
+   if( mpCommand )
+   {
+      // otherwise use ShowHelp
+      HelpSystem::ShowHelp(FindWindow(wxID_HELP), mpCommand->ManualPage(), true);
+   }
+}
+
+
diff --git a/src/commands/AudacityCommand.h b/src/commands/AudacityCommand.h
index ab3ed47ce..04e0a2270 100644
--- a/src/commands/AudacityCommand.h
+++ b/src/commands/AudacityCommand.h
@@ -172,6 +172,7 @@ public:
    virtual void PopulateOrExchange(ShuttleGui & S);
    virtual void OnOk(wxCommandEvent & evt);
    virtual void OnCancel(wxCommandEvent & evt);
+   virtual void OnHelp(wxCommandEvent & evt);
 
 private:
    int mType;