* lily/context-specced-music-iterator.cc (class

[lilypond.git] / lily / include / grace-iterator.hh

diff --git a/lily/include/grace-iterator.hh b/lily/include/grace-iterator.hh
index 37c78b7b3577ed26ad8d585e7fdcd9254bd38864..f758bbd6f8bed460d7737523e004cfb80ebd3770 100644 (file)
--- a/lily/include/grace-iterator.hh
+++ b/lily/include/grace-iterator.hh
@@ -3,12 +3,12 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
-#ifndef GRACE_ITERATOR_HH
-#define GRACE_ITERATOR_HH
+#ifndef NEWGRACE_ITERATOR_HH
+#define NEWGRACE_ITERATOR_HH
 
 #include "music-wrapper-iterator.hh"
 
@@ -16,10 +16,8 @@ class Grace_iterator : public Music_wrapper_iterator
 {
 public:
   VIRTUAL_COPY_CONS (Music_iterator);
-  ~Grace_iterator ();
-  virtual void construct_children () ;
   virtual void process (Moment);
-  static SCM constructor_cxx_function;
+  DECLARE_SCHEME_CALLBACK(constructor, ());
   Moment pending_moment () const;
 };