diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-06-02 17:50:37 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-06-02 17:50:37 +0000 |
| commit | 83f385d26336f58c1b2e3ce49c609fe86878b56d (patch) | |
| tree | 5cc50c4afd705ad83ee4455bd4547eaffc7e7895 /gtk2_ardour/time_axis_view_item.cc | |
| parent | add91aa2d723c15148d83dae7c8178ee6102146e (diff) | |
audio clock switchover part2: remove most egregious include-time dependency on audio_clock.h, and alter API for a few utilities along the way
git-svn-id: svn://localhost/ardour2/branches/3.0@9673 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/time_axis_view_item.cc')
| -rw-r--r-- | gtk2_ardour/time_axis_view_item.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc index 9ddfb30fd4..ce2e6c1485 100644 --- 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; @@ -508,7 +508,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")); } |