diff options
author | David Robillard <d@drobilla.net> | 2011-05-20 03:27:08 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2011-05-20 03:27:08 +0000 |
commit | 4999a7199470ee751d710cfca2a39b4fdc561a82 (patch) | |
tree | 9c3d83689ec89037c3ba22f3f5940857513ae189 /src/gui/Controls.cpp | |
parent | b5bbad8f77e65f8fc8655287f0d2004ebee7c787 (diff) | |
download | ingen-4999a7199470ee751d710cfca2a39b4fdc561a82.tar.gz ingen-4999a7199470ee751d710cfca2a39b4fdc561a82.tar.bz2 ingen-4999a7199470ee751d710cfca2a39b4fdc561a82.zip |
Remove dependency on glade and glademm (migrate to GtkBuilder).
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3295 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/gui/Controls.cpp')
-rw-r--r-- | src/gui/Controls.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/gui/Controls.cpp b/src/gui/Controls.cpp index b9362ed7..af4a139e 100644 --- a/src/gui/Controls.cpp +++ b/src/gui/Controls.cpp @@ -26,7 +26,7 @@ #include "App.hpp" #include "ControlPanel.hpp" #include "Controls.hpp" -#include "GladeFactory.hpp" +#include "WidgetFactory.hpp" #include "PortPropertiesWindow.hpp" using namespace std; @@ -38,13 +38,14 @@ namespace GUI { // ////////////////////// Control ///////////////////////////////// // -Control::Control(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& glade_xml) +Control::Control(BaseObjectType* cobject, + const Glib::RefPtr<Gtk::Builder>& xml) : Gtk::VBox(cobject) , _control_panel(NULL) , _enable_signal(false) , _name_label(NULL) { - Glib::RefPtr<Gnome::Glade::Xml> menu_xml = GladeFactory::new_glade_reference("port_control_menu"); + Glib::RefPtr<Gtk::Builder> menu_xml = WidgetFactory::create("port_control_menu"); menu_xml->get_widget("port_control_menu", _menu); menu_xml->get_widget("port_control_menu_properties", _menu_properties); @@ -105,7 +106,7 @@ Control::set_label(const string& name) void Control::menu_properties() { - Glib::RefPtr<Gnome::Glade::Xml> xml = GladeFactory::new_glade_reference(); + Glib::RefPtr<Gtk::Builder> xml = WidgetFactory::create(); PortPropertiesWindow* window; xml->get_widget_derived("port_properties_win", window); @@ -114,7 +115,8 @@ Control::menu_properties() // ////////////////// SliderControl ////////////////////// // -SliderControl::SliderControl(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml) +SliderControl::SliderControl(BaseObjectType* cobject, + const Glib::RefPtr<Gtk::Builder>& xml) : Control(cobject, xml) , _enabled(true) { @@ -289,7 +291,8 @@ SliderControl::slider_pressed(GdkEvent* ev) // ///////////// ToggleControl ////////////// // -ToggleControl::ToggleControl(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml) +ToggleControl::ToggleControl(BaseObjectType* cobject, + const Glib::RefPtr<Gtk::Builder>& xml) : Control(cobject, xml) { xml->get_widget("toggle_control_name_label", _name_label); @@ -347,7 +350,8 @@ ToggleControl::toggled() // ///////////// StringControl ////////////// // -StringControl::StringControl(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml) +StringControl::StringControl(BaseObjectType* cobject, + const Glib::RefPtr<Gtk::Builder>& xml) : Control(cobject, xml) { xml->get_widget("string_control_name_label", _name_label); |