From c61eb38f8930009d7bb49550ceb17db6c149140f Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Fri, 16 Jan 2015 20:01:34 -0500
Subject: [PATCH] change ArdourDropdown API to allow other types of menu
 elements

Conflicts:
	gtk2_ardour/ardour_dropdown.h
---
 gtk2_ardour/ardour_dropdown.cc | 2 +-
 gtk2_ardour/ardour_dropdown.h  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gtk2_ardour/ardour_dropdown.cc b/gtk2_ardour/ardour_dropdown.cc
index 3e214ef9e8..a9f2c6dec6 100644
--- a/gtk2_ardour/ardour_dropdown.cc
+++ b/gtk2_ardour/ardour_dropdown.cc
@@ -71,7 +71,7 @@ ArdourDropdown::on_mouse_pressed (GdkEventButton*)
 
 
 void
-ArdourDropdown::AddMenuElem (Menu_Helpers::MenuElem e)
+ArdourDropdown::AddMenuElem (Menu_Helpers::Element e)
 {
 	using namespace Menu_Helpers;
 
diff --git a/gtk2_ardour/ardour_dropdown.h b/gtk2_ardour/ardour_dropdown.h
index b9144c97f7..73a63b2947 100644
--- a/gtk2_ardour/ardour_dropdown.h
+++ b/gtk2_ardour/ardour_dropdown.h
@@ -38,7 +38,7 @@ class ArdourDropdown : public ArdourButton
 
 	bool on_mouse_pressed (GdkEventButton*);
 
-	void AddMenuElem (Gtk::Menu_Helpers::MenuElem e);
+	void AddMenuElem (Gtk::Menu_Helpers::Element e);
 
   private:
 	Gtk::Menu      _menu;