diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2005-10-09 12:51:04 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2005-10-09 12:51:04 +0000 |
| commit | 8e591b058786c842c46790c96b806ad1eca6cbec (patch) | |
| tree | 44cb2eadc11cd3436559aa28635e0c5f5f8212ad /gtk2_ardour/marker.cc | |
| parent | c38fdbc64c73c686f9f55729b352f8d0f4c09070 (diff) | |
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
Diffstat (limited to 'gtk2_ardour/marker.cc')
| -rw-r--r-- | gtk2_ardour/marker.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc index 2621102865..0d124f556c 100644 --- 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); |