fixes for utils.cc in gtk2_ardour and gtkmm2ext, including switch to Pango::FontDescr...

[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 7f1bfc53e58c9499ac0c9849c3514039e2df0b4a..62a1e7d9e68afba15f41085b61c94615cac29bbf 100644 (file)
--- a/gtk2_ardour/time_axis_view_item.cc
+++ b/gtk2_ardour/time_axis_view_item.cc
@@ -38,7 +38,8 @@ using namespace Editing;
 
 //------------------------------------------------------------------------------
 /** Initialize static memeber data */
-std::string TimeAxisViewItem::NAME_FONT;
+Pango::FontDescription TimeAxisViewItem::NAME_FONT;
+bool TimeAxisViewItem::have_name_font = false;
 const double TimeAxisViewItem::NAME_X_OFFSET = 15.0;
 const double TimeAxisViewItem::NAME_Y_OFFSET = 15.0 ;           /* XXX depends a lot on the font size, sigh. */
 const double TimeAxisViewItem::NAME_HIGHLIGHT_SIZE = 15.0 ;     /* ditto */
@@ -65,8 +66,9 @@ TimeAxisViewItem::TimeAxisViewItem(std::string it_name, GnomeCanvasGroup* parent
                                   Visibility visibility)
        : trackview (tv)
 {
-       if (NAME_FONT.empty()) {
+       if (!have_name_font) {
                NAME_FONT = get_font_for_style (N_("TimeAxisViewItemName"));
+               have_name_font = true;
        }
 
        item_name = it_name ;