From 744ca0bbcc3d3f5e53dcdbc436c676fd4f8cc6af Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 29 Nov 2011 01:17:13 +0000 Subject: Remove libgnomecanvasmm dependency. git-svn-id: http://svn.drobilla.net/lad/trunk/patchage@3685 a436a847-0d15-0410-975c-d299462d15a1 --- src/Patchage.cpp | 6 +++--- src/main.cpp | 2 -- wscript | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/Patchage.cpp b/src/Patchage.cpp index 0933535..2aad750 100644 --- a/src/Patchage.cpp +++ b/src/Patchage.cpp @@ -148,7 +148,7 @@ Patchage::Patchage(int argc, char** argv) _about_win->property_logo_icon_name() = "patchage"; gtk_window_set_default_icon_name("patchage"); - _main_scrolledwin->add(*_canvas); + _main_scrolledwin->add(_canvas->widget()); _main_scrolledwin->property_hadjustment().get_value()->set_step_increment(10); _main_scrolledwin->property_vadjustment().get_value()->set_step_increment(10); @@ -209,7 +209,7 @@ Patchage::Patchage(int argc, char** argv) _warning_tag->property_foreground() = "#FFFF00"; _status_text->get_buffer()->get_tag_table()->add(_warning_tag); - _canvas->show(); + _canvas->widget().show(); _main_win->present(); _state_manager->load(_settings_filename); @@ -241,7 +241,7 @@ Patchage::Patchage(int argc, char** argv) connect_widgets(); update_state(); - _canvas->grab_focus(); + _canvas->widget().grab_focus(); // Idle callback, check if we need to refresh Glib::signal_timeout().connect( diff --git a/src/main.cpp b/src/main.cpp index 1048523..36dff7d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -24,7 +24,6 @@ #include -#include #include #include "Patchage.hpp" @@ -71,7 +70,6 @@ main(int argc, char** argv) Glib::thread_init(); - Gnome::Canvas::init(); Gtk::Main app(argc, argv); Patchage patchage(argc, argv); diff --git a/wscript b/wscript index 3b0986c..9ec89ad 100644 --- a/wscript +++ b/wscript @@ -48,7 +48,7 @@ def configure(conf): mandatory=False) autowaf.check_pkg(conf, 'dbus-glib-1', uselib_store='DBUS_GLIB', mandatory=False) - autowaf.check_pkg(conf, 'libgnomecanvasmm-2.6', uselib_store='GNOMECANVASMM', + autowaf.check_pkg(conf, 'libgnomecanvas-2.0', uselib_store='GNOMECANVAS', mandatory=True) autowaf.check_pkg(conf, 'gthread-2.0', uselib_store='GTHREAD', atleast_version='2.14.0', mandatory=True) @@ -129,7 +129,7 @@ def build(bld): prog.includes = ['.', 'src'] prog.target = out_base + bld.env['APP_INSTALL_NAME'] prog.install_path = '${BINDIR}' - autowaf.use_lib(bld, prog, 'DBUS FLOWCANVAS DBUS_GLIB GTKMM GNOMECANVASMM GTHREAD GTK_OSX') + autowaf.use_lib(bld, prog, 'DBUS FLOWCANVAS DBUS_GLIB GTKMM GNOMECANVAS GTHREAD GTK_OSX') prog.source = ''' src/Patchage.cpp src/PatchageCanvas.cpp -- cgit v1.2.1