smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-20 13:46:30 +01:00
Code Issues Projects Releases Wiki Activity

make creation of ArdourCanvas objects in waves_ui.cc conditional on ARDOUR_CANVAS_HAS_XML_UI

Browse source
This commit is contained in:
Paul Davis 2014-08-17 13:27:00 -04:00
parent 4078063b00
commit dcbcf09cf5
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/waves_ui.cc
View file

@ -121,9 +121,11 @@ WavesUI::create_widget (const XMLNode& definition, const XMLNodeMap& styles)
child = manage (new Gtk::Layout (get_adjustment(hadjustment_id.c_str()), child = manage (new Gtk::Layout (get_adjustment(hadjustment_id.c_str()),
get_adjustment(vadjustment_id.c_str()))); get_adjustment(vadjustment_id.c_str())));
} }
#ifdef ARDOUR_CANVAS_HAS_XMLUI
} else if (widget_type == "CANVAS") { } else if (widget_type == "CANVAS") {
std::map<std::string, ArdourCanvas::Item*> named_items; std::map<std::string, ArdourCanvas::Item*> named_items;
child = manage (new ArdourCanvas::GtkCanvas (definition, styles, named_items)); child = manage (new ArdourCanvas::GtkCanvas (definition, styles, named_items));
#endif
} else if (widget_type == "SCROLLEDWINDOW") { } else if (widget_type == "SCROLLEDWINDOW") {
child = manage (new Gtk::ScrolledWindow); child = manage (new Gtk::ScrolledWindow);
} else if (widget_type == "FIXED") { } else if (widget_type == "FIXED") {

3
gtk2_ardour/waves_ui.h
View file

@ -31,6 +31,7 @@
#include <gtkmm/scrolledwindow.h> #include <gtkmm/scrolledwindow.h>
#include "gtkmm2ext/fader.h" #include "gtkmm2ext/fader.h"
#include "gtkmm2ext/focus_entry.h" #include "gtkmm2ext/focus_entry.h"
#include "pbd/xml++.h"
#include "canvas/canvas.h" #include "canvas/canvas.h"
#include "canvas/xml_ui.h" #include "canvas/xml_ui.h"
#include "waves_grid.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); Gtk::Widget* add_widget (Gtk::EventBox& parent, const XMLNode& definition, const XMLNodeMap& styles);
}; };
#endif //__WAVES_UI_H__ #endif //__WAVES_UI_H__