From b7f35609ad9819c0565227d6e36666bccc5efdff Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Tue, 23 Oct 2018 04:59:32 -0400
Subject: [PATCH] Clarify inheritance of MenuCommandHandler

---
 src/Menus.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Menus.h b/src/Menus.h
index ffe50c9b2..da52f3e03 100644
--- a/src/Menus.h
+++ b/src/Menus.h
@@ -16,6 +16,7 @@
 #include <vector>
 #include <wx/event.h>
 #include "SelectedRegion.h"
+#include "commands/CommandFunctors.h"
 
 class AudacityProject;
 class CommandContext;
@@ -34,7 +35,9 @@ enum EffectType : int;
 typedef wxString PluginID;
 typedef wxArrayString PluginIDList;
 
-struct MenuCommandHandler : public wxEvtHandler {
+struct MenuCommandHandler final
+   : public CommandHandlerObject // MUST be the first base class!
+{
    MenuCommandHandler();
    ~MenuCommandHandler();