summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2014-06-22 09:29:16 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2014-06-22 09:29:16 -0400
commit99f9b3456ab72d8172ce8296ed57417558ab73c7 (patch)
treef7917e81aeb3135d90631eb5bd5881303621e25c /libs
parent0796ccfb652dd31ea1d94526e0e6d92863a972b0 (diff)
explicitly qualify cast to ArdourCanvas::Container so that it works.
I assume that gcc is failing to complain about ambiguity with Gtk::Container even though there should really be no ambiguity
Diffstat (limited to 'libs')
-rw-r--r--libs/canvas/canvas.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/libs/canvas/canvas.cc b/libs/canvas/canvas.cc
index 8c7960a217..4371e60658 100644
--- a/libs/canvas/canvas.cc
+++ b/libs/canvas/canvas.cc
@@ -392,15 +392,14 @@ GtkCanvas::pick_current_item (Duple const & point, int state)
for (i = items.begin(); i != items.end(); ++i) {
- Item const * new_item = *i;
+ Item const * possible_item = *i;
- /* We ignore invisible items, groups and items that ignore events */
+ /* We ignore invisible items, containers and items that ignore events */
- if (!new_item->visible() || new_item->ignore_events() || dynamic_cast<Container const *>(new_item) != 0) {
+ if (!possible_item->visible() || possible_item->ignore_events() || dynamic_cast<ArdourCanvas::Container const *>(possible_item) != 0) {
continue;
}
-
- within_items.push_front (new_item);
+ within_items.push_front (possible_item);
}
if (within_items.empty()) {