remove OS X specific code for key editor binding displays

[ardour.git] / gtk2_ardour / time_axis_view_item.cc

diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc
index 9ddfb30fd452f547a1072e50b4e47c4e6303acac..9df586bf7f2de7d75074214afe30b2122713e0f9 100644 (file)
--- a/gtk2_ardour/time_axis_view_item.cc
+++ b/gtk2_ardour/time_axis_view_item.cc
@@ -50,7 +50,7 @@ using namespace PBD;
 using namespace ARDOUR;
 using namespace Gtkmm2ext;
 
-Pango::FontDescription* TimeAxisViewItem::NAME_FONT = 0;
+Pango::FontDescription TimeAxisViewItem::NAME_FONT;
 const double TimeAxisViewItem::NAME_X_OFFSET = 15.0;
 const double TimeAxisViewItem::GRAB_HANDLE_LENGTH = 6;
 
@@ -72,7 +72,7 @@ TimeAxisViewItem::set_constant_heights ()
         int width = 0;
         int height = 0;
 
-        layout->set_font_description (*NAME_FONT);
+        layout->set_font_description (NAME_FONT);
         Gtkmm2ext::get_ink_pixel_size (layout, width, height);
 
         NAME_HEIGHT = height;
@@ -109,7 +109,8 @@ TimeAxisViewItem::TimeAxisViewItem(
 }
 
 TimeAxisViewItem::TimeAxisViewItem (const TimeAxisViewItem& other)
-       : sigc::trackable(other)
+       : trackable (other)
+       , Selectable (other)
        , PBD::ScopedConnectionList()
        , trackview (other.trackview)
        , _recregion (other._recregion)
@@ -508,7 +509,7 @@ TimeAxisViewItem::set_name_text(const string& new_name)
        }
 
        last_item_width = trackview.editor().frame_to_pixel(item_duration);
-       name_pixbuf_width = pixel_width (new_name, *NAME_FONT) + 2;
+       name_pixbuf_width = pixel_width (new_name, NAME_FONT) + 2;
        name_pixbuf->property_pixbuf() = pixbuf_from_string(new_name, NAME_FONT, name_pixbuf_width, NAME_HEIGHT, Gdk::Color ("#000000"));
 }