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

[ardour.git] / gtk2_ardour / marker.cc

diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc
index 262110286571fbc2e5d63a88f284d6c2a383a9e9..0d124f556c46a497671d8ee84fa579dc36df75d7 100644 (file)
--- a/gtk2_ardour/marker.cc
+++ b/gtk2_ardour/marker.cc
@@ -351,17 +351,17 @@ Marker::Marker (PublicEditor& ed, GnomeCanvasGroup *parent, guint32 rgba, const
                                    "outline_color", "black",
                                    NULL);
 
-       string fontname = get_font_for_style (N_("MarkerText"));
+       Pango::FontDescription font = get_font_for_style (N_("MarkerText"));
 
        text = gnome_canvas_item_new (GNOME_CANVAS_GROUP(group),
-                                   gnome_canvas_text_get_type (),
-                                   "text", annotation.c_str(),
-                                   "x", label_offset,
-                                   "y", 0.0,
-                                   "font", fontname.c_str(),
-                                   "anchor", GTK_ANCHOR_NW,
-                                   "fill_color", "black",
-                                   NULL);
+                                     gnome_canvas_text_get_type (),
+                                     "text", annotation.c_str(),
+                                     "x", label_offset,
+                                     "y", 0.0,
+                                     "fontdesc", font,
+                                     "anchor", GTK_ANCHOR_NW,
+                                     "fill_color", "black",
+                                     NULL);
 
        gtk_object_set_data (GTK_OBJECT(group), "marker", this);
        gtk_signal_connect (GTK_OBJECT(group), "event", (GtkSignalFunc) callback, &editor);