X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmusic-wrapper-iterator.hh;h=3abddfeccfeb5889bf26be403cb0aeab351d1683;hb=489ffb188ae02237fa0a22763d08841a669dc2a4;hp=2c9b2594972072ec0857a4646d7ffe22d754c3a6;hpb=d9b43b93f2c885409bafdb157138158f65cc49aa;p=lilypond.git

diff --git a/lily/include/music-wrapper-iterator.hh b/lily/include/music-wrapper-iterator.hh
index 2c9b259497..3abddfeccf 100644
--- a/lily/include/music-wrapper-iterator.hh
+++ b/lily/include/music-wrapper-iterator.hh
@@ -1,46 +1,40 @@
-/*   
+/*
   music-wrapper-iterator.hh -- declare Music_wrapper_iterator
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1998--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef MUSIC_WRAPPER_ITERATOR_HH
 #define MUSIC_WRAPPER_ITERATOR_HH
 
-#include "music.hh"
 #include "music-iterator.hh"
 
-/** 
-  The iterator for a #Music_wrapper#.  Since #Music_wrapper# essentially
-  does nothing, this iterator creates a child iterator and delegates
-  all work to that child.
- */
+/**
+   The iterator for a #Music_wrapper#.  Since #Music_wrapper# essentially
+   does nothing, this iterator creates a child iterator and delegates
+   all work to that child.
+*/
 class Music_wrapper_iterator : public Music_iterator
 {
 public:
-  VIRTUAL_COPY_CONS (Music_iterator);
-  static SCM constructor_cxx_function;  
+  DECLARE_SCHEME_CALLBACK (constructor, ());
   Music_wrapper_iterator ();
-  Music_wrapper_iterator (Music_wrapper_iterator const&);
-  ~Music_wrapper_iterator ();
+  DECLARE_CLASSNAME(Music_wrapper_iterator);
 
-  virtual void construct_children () ;
+  virtual void derived_substitute (Context *f, Context *t);
+  virtual void derived_mark () const;
+  virtual void construct_children ();
   virtual Moment pending_moment () const;
+  virtual void do_quit ();
   virtual bool ok () const;
-  virtual SCM get_music (Moment)const;
-  virtual void skip (Moment);
-
+  virtual bool run_always () const;
 protected:
   virtual void process (Moment);
-  virtual Music_iterator *try_music_in_children (Music *) const;
 
-  Music_iterator *child_iter_p_;
+  Music_iterator *child_iter_;
 };
 
 #endif /* MUSIC_WRAPPER_ITERATOR_HH */
 
-
-