aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/gui/MachinaCanvas.cpp2
-rw-r--r--src/gui/MachinaGUI.cpp7
-rw-r--r--src/gui/MachinaGUI.hpp3
-rw-r--r--src/gui/main.cpp2
-rw-r--r--src/gui/wscript2
5 files changed, 7 insertions, 9 deletions
diff --git a/src/gui/MachinaCanvas.cpp b/src/gui/MachinaCanvas.cpp
index 15a8a4a..17cfb4c 100644
--- a/src/gui/MachinaCanvas.cpp
+++ b/src/gui/MachinaCanvas.cpp
@@ -39,7 +39,7 @@ MachinaCanvas::MachinaCanvas(MachinaGUI* app, int width, int height)
: Canvas(width, height)
, _app(app)
{
- grab_focus();
+ widget().grab_focus();
}
void
diff --git a/src/gui/MachinaGUI.cpp b/src/gui/MachinaGUI.cpp
index a11fe5e..7d39676 100644
--- a/src/gui/MachinaGUI.cpp
+++ b/src/gui/MachinaGUI.cpp
@@ -22,7 +22,6 @@
#include <fstream>
#include <limits.h>
#include <pthread.h>
-#include <libgnomecanvasmm.h>
#include "sord/sordmm.hpp"
#include "machina/Controller.hpp"
#include "machina/Engine.hpp"
@@ -95,11 +94,11 @@ MachinaGUI::MachinaGUI(SharedPtr<Machina::Engine> engine)
xml->get_widget("remove_edge_but", _remove_edge_button);
xml->get_widget("adjust_edge_but", _adjust_edge_button);
- _canvas_scrolledwindow->add(*_canvas);
+ _canvas_scrolledwindow->add(_canvas->widget());
_canvas_scrolledwindow->signal_event().connect(sigc::mem_fun(this,
&MachinaGUI::scrolled_window_event));
_canvas->scroll_to(static_cast<int>(_canvas->width()/2 - 320),
- static_cast<int>(_canvas->height()/2 - 240)); // FIXME: hardcoded
+ static_cast<int>(_canvas->height()/2 - 240)); // FIXME: hardcoded
_canvas_scrolledwindow->property_hadjustment().get_value()->set_step_increment(10);
_canvas_scrolledwindow->property_vadjustment().get_value()->set_step_increment(10);
@@ -165,7 +164,7 @@ MachinaGUI::MachinaGUI(SharedPtr<Machina::Engine> engine)
connect_widgets();
- _canvas->show();
+ _canvas->widget().show();
_main_window->present();
diff --git a/src/gui/MachinaGUI.hpp b/src/gui/MachinaGUI.hpp
index aba2652..1b7afa5 100644
--- a/src/gui/MachinaGUI.hpp
+++ b/src/gui/MachinaGUI.hpp
@@ -19,7 +19,8 @@
#define MACHINA_GUI_HPP
#include <string>
-#include <libgnomecanvasmm.h>
+
+#include <gtkmm.h>
#include "raul/Maid.hpp"
#include "raul/SharedPtr.hpp"
diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index 834b62f..1e49c3b 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -19,7 +19,6 @@
#include <signal.h>
#include <iostream>
#include <string>
-#include <libgnomecanvasmm.h>
#include "sord/sordmm.hpp"
#include "machina/Engine.hpp"
#include "machina/Loader.hpp"
@@ -77,7 +76,6 @@ main(int argc, char** argv)
SharedPtr<Driver> driver(Engine::new_driver(driver_name, machine));
SharedPtr<Engine> engine(new Engine(driver, rdf_world));
- Gnome::Canvas::init();
Gtk::Main app(argc, argv);
driver->activate();
diff --git a/src/gui/wscript b/src/gui/wscript
index a728ce1..5b664cd 100644
--- a/src/gui/wscript
+++ b/src/gui/wscript
@@ -20,7 +20,7 @@ def build(bld):
FLOWCANVAS
GLADEMM
GLIBMM
- GNOMECANVASMM
+ GNOMECANVAS
GTKMM
RAUL
SORD