summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-11-29 01:17:13 +0000
committerDavid Robillard <d@drobilla.net>2011-11-29 01:17:13 +0000
commite5418b8682ea9ae6df69661578194ffe9d9597d5 (patch)
treeba8685e3f8e5ddbdcd2a0bd72b8ae0ca143a47da
parentda344ae601c38938e125042e6df5321a576b89af (diff)
downloadingen-e5418b8682ea9ae6df69661578194ffe9d9597d5.tar.gz
ingen-e5418b8682ea9ae6df69661578194ffe9d9597d5.tar.bz2
ingen-e5418b8682ea9ae6df69661578194ffe9d9597d5.zip
Remove libgnomecanvasmm dependency.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3685 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--src/gui/App.cpp2
-rw-r--r--src/gui/App.hpp1
-rw-r--r--src/gui/NodeModule.hpp1
-rw-r--r--src/gui/PatchPortModule.hpp1
-rw-r--r--src/gui/PatchView.cpp4
-rw-r--r--src/gui/PatchView.hpp1
-rw-r--r--src/gui/SubpatchModule.hpp1
-rw-r--r--src/gui/wscript2
8 files changed, 3 insertions, 10 deletions
diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index a4f9508d..24e61e1e 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -21,7 +21,6 @@
#include <time.h>
#include <sys/time.h>
-#include <libgnomecanvasmm.h>
#include <gtk/gtkwindow.h>
#include "flowcanvas/Connection.hpp"
@@ -105,7 +104,6 @@ App::~App()
SharedPtr<App>
App::create(Ingen::Shared::World* world)
{
- Gnome::Canvas::init();
_main = new Gtk::Main(&world->argc(), &world->argv());
App* app = new App(world);
diff --git a/src/gui/App.hpp b/src/gui/App.hpp
index c7fa9f52..69bcd793 100644
--- a/src/gui/App.hpp
+++ b/src/gui/App.hpp
@@ -24,7 +24,6 @@
#include <utility>
#include <gtkmm.h>
-#include <libgnomecanvasmm.h>
#include "raul/SharedPtr.hpp"
#include "raul/Deletable.hpp"
diff --git a/src/gui/NodeModule.hpp b/src/gui/NodeModule.hpp
index 5109be96..60b4cb86 100644
--- a/src/gui/NodeModule.hpp
+++ b/src/gui/NodeModule.hpp
@@ -19,7 +19,6 @@
#define INGEN_GUI_NODEMODULE_HPP
#include <string>
-#include <libgnomecanvasmm.h>
#include "flowcanvas/Module.hpp"
#include "raul/SharedPtr.hpp"
#include "Port.hpp"
diff --git a/src/gui/PatchPortModule.hpp b/src/gui/PatchPortModule.hpp
index c351c1bc..3a180b24 100644
--- a/src/gui/PatchPortModule.hpp
+++ b/src/gui/PatchPortModule.hpp
@@ -20,7 +20,6 @@
#include <string>
#include <boost/enable_shared_from_this.hpp>
-#include <libgnomecanvasmm.h>
#include "flowcanvas/Module.hpp"
#include "raul/URI.hpp"
#include "Port.hpp"
diff --git a/src/gui/PatchView.cpp b/src/gui/PatchView.cpp
index 6dee326b..fd9a4867 100644
--- a/src/gui/PatchView.cpp
+++ b/src/gui/PatchView.cpp
@@ -78,7 +78,7 @@ PatchView::set_patch(SharedPtr<const PatchModel> patch)
_canvas = SharedPtr<PatchCanvas>(new PatchCanvas(*_app, patch, 1600*2, 1200*2));
_canvas->build();
- _canvas_scrolledwindow->add(*_canvas);
+ _canvas_scrolledwindow->add(_canvas->widget());
_poly_spin->set_value(patch->internal_poly());
@@ -119,7 +119,7 @@ PatchView::set_patch(SharedPtr<const PatchModel> patch)
sigc::mem_fun(*this, &PatchView::canvas_item_left));
#endif
- _canvas->grab_focus();
+ _canvas->widget().grab_focus();
}
SharedPtr<PatchView>
diff --git a/src/gui/PatchView.hpp b/src/gui/PatchView.hpp
index cc221bde..19289164 100644
--- a/src/gui/PatchView.hpp
+++ b/src/gui/PatchView.hpp
@@ -21,7 +21,6 @@
#include <string>
#include <gtkmm.h>
-#include <libgnomecanvasmm.h>
#include "raul/SharedPtr.hpp"
diff --git a/src/gui/SubpatchModule.hpp b/src/gui/SubpatchModule.hpp
index 97a7d85c..f855a467 100644
--- a/src/gui/SubpatchModule.hpp
+++ b/src/gui/SubpatchModule.hpp
@@ -19,7 +19,6 @@
#define INGEN_GUI_SUBPATCHMODULE_HPP
#include <string>
-#include <libgnomecanvasmm.h>
#include "raul/SharedPtr.hpp"
#include "PatchPortModule.hpp"
#include "NodeModule.hpp"
diff --git a/src/gui/wscript b/src/gui/wscript
index 642148b1..a550e56a 100644
--- a/src/gui/wscript
+++ b/src/gui/wscript
@@ -14,7 +14,7 @@ def build(bld):
FLOWCANVAS
GLADEMM
GLIBMM
- GNOMECANVASMM
+ GNOMECANVAS
GTKMM
LILV
LV2CORE