From dcbcf09cf55b64e7825f80546266fad898415cb2 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Sun, 17 Aug 2014 13:27:00 -0400
Subject: [PATCH] make creation of ArdourCanvas objects in waves_ui.cc
 conditional on ARDOUR_CANVAS_HAS_XML_UI

---
 gtk2_ardour/waves_ui.cc | 2 ++
 gtk2_ardour/waves_ui.h  | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/gtk2_ardour/waves_ui.cc b/gtk2_ardour/waves_ui.cc
index c40dd9ec65..40bc018d25 100644
--- a/gtk2_ardour/waves_ui.cc
+++ b/gtk2_ardour/waves_ui.cc
@@ -121,9 +121,11 @@ WavesUI::create_widget (const XMLNode& definition, const XMLNodeMap& styles)
 			child = manage (new Gtk::Layout (get_adjustment(hadjustment_id.c_str()), 
 											 get_adjustment(vadjustment_id.c_str())));
 		}
+#ifdef ARDOUR_CANVAS_HAS_XMLUI                
 	} else if (widget_type == "CANVAS") {
 		std::map<std::string, ArdourCanvas::Item*> named_items;
 		child = manage (new ArdourCanvas::GtkCanvas (definition, styles, named_items));
+#endif
 	} else if (widget_type == "SCROLLEDWINDOW") {
 		child = manage (new Gtk::ScrolledWindow);
 	} else if (widget_type == "FIXED") {
diff --git a/gtk2_ardour/waves_ui.h b/gtk2_ardour/waves_ui.h
index 58c5e94fb8..f2c95dfb03 100644
--- a/gtk2_ardour/waves_ui.h
+++ b/gtk2_ardour/waves_ui.h
@@ -31,6 +31,7 @@
 #include <gtkmm/scrolledwindow.h>
 #include "gtkmm2ext/fader.h"
 #include "gtkmm2ext/focus_entry.h"
+#include "pbd/xml++.h"
 #include "canvas/canvas.h"
 #include "canvas/xml_ui.h"
 #include "waves_grid.h"
@@ -96,4 +97,4 @@ class WavesUI : public std::map<std::string, Gtk::Object*> {
 	Gtk::Widget* add_widget (Gtk::EventBox& parent, const XMLNode& definition, const XMLNodeMap& styles);
 };
 
-#endif //__WAVES_UI_H__
\ No newline at end of file
+#endif //__WAVES_UI_H__