From 30c4ca70ee36593fd2f00326203705a09c1088dd Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Mon, 11 Feb 2019 19:49:29 -0500
Subject: [PATCH] Make EXPERIMENTAL_EFFECTS_RACK compilable

---
 src/effects/EffectRack.cpp | 5 +++--
 src/effects/EffectRack.h   | 2 +-
 src/menus/ViewMenus.cpp    | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/effects/EffectRack.cpp b/src/effects/EffectRack.cpp
index 93f6d4ca7..e033718bf 100644
--- a/src/effects/EffectRack.cpp
+++ b/src/effects/EffectRack.cpp
@@ -37,6 +37,7 @@
 #include "EffectManager.h"
 #include "EffectRack.h"
 #include "../commands/CommandContext.h"
+#include "../Menus.h"
 #include "../Prefs.h"
 #include "../Project.h"
 
@@ -394,7 +395,7 @@ void EffectRack::OnDown(wxCommandEvent & evt)
 
    evt.Skip();
 
-   size_t index = GetEffectIndex(btn);
+   int index = GetEffectIndex(btn);
    if (index < 0 || index == (mMainSizer->GetChildren().GetCount() / NUMCOLS) - 1)
    {
       return;
@@ -459,7 +460,7 @@ void EffectRack::OnRemove(wxCommandEvent & evt)
    UpdateActive();
 }
 
-wxBitmap EffectRack::CreateBitmap(const char *xpm[], bool up, bool pusher)
+wxBitmap EffectRack::CreateBitmap(const char *const xpm[], bool up, bool pusher)
 {
    wxMemoryDC dc;
    wxBitmap pic(xpm);
diff --git a/src/effects/EffectRack.h b/src/effects/EffectRack.h
index d4ed9ab35..ed0afcda3 100644
--- a/src/effects/EffectRack.h
+++ b/src/effects/EffectRack.h
@@ -40,7 +40,7 @@ public:
 
 private:
 
-   wxBitmap CreateBitmap(const char *xpm[], bool up, bool pusher);
+   wxBitmap CreateBitmap(const char *const xpm[], bool up, bool pusher);
    int GetEffectIndex(wxWindow *win);
    void MoveRowUp(int row);
    void UpdateActive();
diff --git a/src/menus/ViewMenus.cpp b/src/menus/ViewMenus.cpp
index f1cfef9a6..cd2629957 100644
--- a/src/menus/ViewMenus.cpp
+++ b/src/menus/ViewMenus.cpp
@@ -364,7 +364,7 @@ void OnShowClipping(const CommandContext &context)
 }
 
 #if defined(EXPERIMENTAL_EFFECTS_RACK)
-void OnShowEffectsRack(const &WXUNUSED(context) )
+void OnShowEffectsRack(const CommandContext &WXUNUSED(context) )
 {
    EffectManager::Get().ShowRack();
 }