summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-12-01 20:19:07 +0000
committerDavid Robillard <d@drobilla.net>2011-12-01 20:19:07 +0000
commitf0a75a3f1d835bc235953d03e1b219bc8d6fcfab (patch)
treee5579036cb58c7086b4f40d09601d449cf9421fe
parent3fbbae59dc5f6ea3f610777fa19199a29f48ac91 (diff)
downloadingen-f0a75a3f1d835bc235953d03e1b219bc8d6fcfab.tar.gz
ingen-f0a75a3f1d835bc235953d03e1b219bc8d6fcfab.tar.bz2
ingen-f0a75a3f1d835bc235953d03e1b219bc8d6fcfab.zip
Fix compilation.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3728 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--src/gui/NodeModule.cpp6
-rw-r--r--src/gui/NodeModule.hpp2
-rw-r--r--src/gui/PatchCanvas.cpp2
-rw-r--r--src/gui/PatchPortModule.cpp6
-rw-r--r--src/gui/PatchPortModule.hpp2
-rw-r--r--src/gui/Port.cpp6
-rw-r--r--src/gui/Port.hpp2
7 files changed, 13 insertions, 13 deletions
diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp
index f30e2fc4..79ca74eb 100644
--- a/src/gui/NodeModule.cpp
+++ b/src/gui/NodeModule.cpp
@@ -405,7 +405,7 @@ NodeModule::property_changed(const URI& key, const Atom& value)
if (key == uris.ingen_polyphonic) {
set_stacked_border(value.get_bool());
} else if (key == uris.ingen_selected) {
- if (value.get_bool() != selected()) {
+ if (value.get_bool() != get_selected()) {
if (value.get_bool())
_canvas->select_item(this);
else
@@ -423,10 +423,10 @@ NodeModule::property_changed(const URI& key, const Atom& value)
}
void
-NodeModule::set_selected(bool b)
+NodeModule::set_selected(gboolean b)
{
const URIs& uris = app().uris();
- if (b != selected()) {
+ if (b != get_selected()) {
Module::set_selected(b);
if (b) {
PatchWindow* win = app().window_factory()->parent_patch_window(node());
diff --git a/src/gui/NodeModule.hpp b/src/gui/NodeModule.hpp
index c0cf3ec5..0c579d27 100644
--- a/src/gui/NodeModule.hpp
+++ b/src/gui/NodeModule.hpp
@@ -76,7 +76,7 @@ protected:
void embed_gui(bool embed);
bool popup_gui();
void on_gui_window_close();
- void set_selected(bool b);
+ void set_selected(gboolean b);
void rename();
void property_changed(const Raul::URI& predicate, const Raul::Atom& value);
diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp
index af68bbae..7256707a 100644
--- a/src/gui/PatchCanvas.cpp
+++ b/src/gui/PatchCanvas.cpp
@@ -620,7 +620,7 @@ PatchCanvas::select_all()
unselect_ports();
FOREACH_ITEM(m, items())
if (dynamic_cast<FlowCanvas::Module*>(*m))
- if (!(*m)->selected())
+ if (!(*m)->get_selected())
select_item(*m);
}
diff --git a/src/gui/PatchPortModule.cpp b/src/gui/PatchPortModule.cpp
index 670de9e9..3efd577f 100644
--- a/src/gui/PatchPortModule.cpp
+++ b/src/gui/PatchPortModule.cpp
@@ -149,7 +149,7 @@ PatchPortModule::property_changed(const URI& key, const Atom& value)
if (key == uris.ingen_polyphonic) {
set_stacked_border(value.get_bool());
} else if (key == uris.ingen_selected) {
- if (value.get_bool() != selected()) {
+ if (value.get_bool() != get_selected()) {
if (value.get_bool()) {
_canvas->select_item(this);
} else {
@@ -162,9 +162,9 @@ PatchPortModule::property_changed(const URI& key, const Atom& value)
}
void
-PatchPortModule::set_selected(bool b)
+PatchPortModule::set_selected(gboolean b)
{
- if (b != selected()) {
+ if (b != get_selected()) {
Module::set_selected(b);
if (app().signal())
app().engine()->set_property(_model->path(),
diff --git a/src/gui/PatchPortModule.hpp b/src/gui/PatchPortModule.hpp
index 3a180b24..04f70ad1 100644
--- a/src/gui/PatchPortModule.hpp
+++ b/src/gui/PatchPortModule.hpp
@@ -67,7 +67,7 @@ protected:
SharedPtr<const PortModel> model);
bool show_menu(GdkEventButton* ev);
- void set_selected(bool b);
+ void set_selected(gboolean b);
void set_port(Port* port) { _port = port; }
diff --git a/src/gui/Port.cpp b/src/gui/Port.cpp
index dc7d0254..5d6d7f39 100644
--- a/src/gui/Port.cpp
+++ b/src/gui/Port.cpp
@@ -162,7 +162,7 @@ Port::on_event(GdkEvent* ev)
break;
}
- return Object::on_event(ev);
+ return FlowCanvas::Port::on_event(ev);
}
bool
@@ -309,9 +309,9 @@ Port::dash()
*/
void
-Port::set_selected(bool b)
+Port::set_selected(gboolean b)
{
- if (b != selected()) {
+ if (b != get_selected()) {
FlowCanvas::Port::set_selected(b);
SharedPtr<const PortModel> pm = _port_model.lock();
if (pm && b) {
diff --git a/src/gui/Port.hpp b/src/gui/Port.hpp
index e63401d5..569090a5 100644
--- a/src/gui/Port.hpp
+++ b/src/gui/Port.hpp
@@ -60,7 +60,7 @@ public:
void value_changed(const Raul::Atom& value);
void activity(const Raul::Atom& value);
- void set_selected(bool b);
+ void set_selected(gboolean b);
//ArtVpathDash* dash();