X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fballoon.cc;h=d8519f6e39345bfd45f8a08dab5e7c0597534bd1;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=b412a435d24005998aa4fbb389e145edcb1f97ef;hpb=d2762a4f1add2bb04d6fc34d3c7ae03eeb7d500f;p=lilypond.git

diff --git a/lily/balloon.cc b/lily/balloon.cc
index b412a435d2..d8519f6e39 100644
--- a/lily/balloon.cc
+++ b/lily/balloon.cc
@@ -33,7 +33,6 @@ class Balloon_interface
 public:
   DECLARE_SCHEME_CALLBACK (print, (SCM));
   DECLARE_SCHEME_CALLBACK (print_spanner, (SCM));
-  DECLARE_GROB_INTERFACE ();
 
   static SCM internal_balloon_print (Grob *me, Grob *p, Offset off);
 };
@@ -42,7 +41,7 @@ MAKE_SCHEME_CALLBACK (Balloon_interface, print, 1);
 SCM
 Balloon_interface::print (SCM smob)
 {
-  Grob *me = Grob::unsmob (smob);
+  Grob *me = unsmob<Grob> (smob);
 
   if (Item *item = dynamic_cast<Item *> (me))
     if (!Item::break_visible (item))
@@ -60,7 +59,7 @@ MAKE_SCHEME_CALLBACK (Balloon_interface, print_spanner, 1);
 SCM
 Balloon_interface::print_spanner (SCM smob)
 {
-  Spanner *me = Spanner::unsmob (smob);
+  Spanner *me = unsmob<Spanner> (smob);
   Spanner *orig = dynamic_cast<Spanner *> (me->original ());
 
   if (orig)
@@ -88,8 +87,8 @@ Balloon_interface::print_spanner (SCM smob)
 SCM
 Balloon_interface::internal_balloon_print (Grob *me, Grob *p, Offset off)
 {
-  Box b (p->extent (p, X_AXIS),
-         p->extent (p, Y_AXIS));
+  Box b (robust_relative_extent (p, p, X_AXIS),
+         robust_relative_extent (p, p, Y_AXIS));
   Real padding = robust_scm2double (me->get_property ("padding"), .1);
   b.widen (padding, padding);
 
@@ -102,7 +101,7 @@ Balloon_interface::internal_balloon_print (Grob *me, Grob *p, Offset off)
   SCM chain = Font_interface::text_font_alist_chain (me);
   SCM stencil = Text_interface::interpret_markup (me->layout ()->self_scm (),
                                                   chain, bt);
-  Stencil *text_stil = Stencil::unsmob (stencil);
+  Stencil *text_stil = unsmob<Stencil> (stencil);
 
   Offset z1;