Use PBD::to_string from pbd/string_convert.h in MeterStrip class

[ardour.git] / libs / canvas / canvas.cc

diff --git a/libs/canvas/canvas.cc b/libs/canvas/canvas.cc
index 1995608a9fcd346f6f7d8a5031cf8306d84b0def..fb06b06b975eb49eca34793a18cfee07c125742f 100644 (file)
--- a/libs/canvas/canvas.cc
+++ b/libs/canvas/canvas.cc
@@ -409,9 +409,7 @@ GtkCanvas::use_nsglview ()
        assert (!_nsglview);
        assert (!is_realized());
 #ifdef ARDOUR_CANVAS_NSVIEW_TAG // patched gdkquartz.h
-# ifndef __ppc__ // would need to flip RGBA <> RGBA
        _nsglview = Gtkmm2ext::nsglview_create (this);
-# endif
 #endif
 }
 
@@ -731,6 +729,15 @@ GtkCanvas::deliver_event (GdkEvent* event)
        return false;
 }
 
+void
+GtkCanvas::item_shown_or_hidden (Item* item)
+{
+       if (item == current_tooltip_item) {
+               stop_tooltip_timeout ();
+       }
+       Canvas::item_shown_or_hidden (item);
+}
+
 /** Called when an item is being destroyed.
  *  @param item Item being destroyed.
  *  @param bounding_box Last known bounding box of the item.
@@ -1138,6 +1145,7 @@ GtkCanvas::on_map ()
 void
 GtkCanvas::on_unmap ()
 {
+       stop_tooltip_timeout ();
        Gtk::EventBox::on_unmap();
 #ifdef __APPLE__
        if (_nsglview) {