fixes for utils.cc in gtk2_ardour and gtkmm2ext, including switch to Pango::FontDescription rather than string

git-svn-id: svn://localhost/trunk/ardour2@53 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2005-10-09 12:51:04 +00:00
parent c38fdbc64c
commit 8e591b0587
8 changed files with 112 additions and 81 deletions

View file

@ -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);