Merge branch 'master' of ssh+git://jneem@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / include / spaceable-grob.hh

diff --git a/lily/include/spaceable-grob.hh b/lily/include/spaceable-grob.hh
index 3167a5e3519f5be8ea5de91ddb5233b482275cb2..cb1217bf6f02d317820e845f27e5f96323a5e777 100644 (file)
--- a/lily/include/spaceable-grob.hh
+++ b/lily/include/spaceable-grob.hh
@@ -9,8 +9,8 @@
 #ifndef SPACEABLE_GROB_HH
 #define SPACEABLE_GROB_HH
 
-#include "lily-guile.hh"
 #include "lily-proto.hh"
+#include "grob-interface.hh"
 
 struct Spaceable_grob
 {
@@ -19,7 +19,7 @@ struct Spaceable_grob
   static void add_spring (Grob *me, Grob *to, Real dist, Real strength);
   static void get_spring (Grob *me, Grob *other, Real *dist, Real *inv_strength);
 
-  static bool has_interface (Grob *);
+  DECLARE_GROB_INTERFACE();
   static void remove_interface (Grob *);
   static SCM get_minimum_distances (Grob *);
   static SCM get_ideal_distances (Grob *);