X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Finclude%2Fmusic-wrapper-iterator.hh;h=3283347fde18de6751012237e6b525fb04d0ac06;hb=ad9cd0cc0288ba80d310a5ba4836ce63b1b4f174;hp=edb6b8a4d899b58159aba4dad6db436ff75cb563;hpb=0e0a18dbaa12275d0a07b76104243a15da821a15;p=lilypond.git

diff --git a/lily/include/music-wrapper-iterator.hh b/lily/include/music-wrapper-iterator.hh
index edb6b8a4d8..3283347fde 100644
--- a/lily/include/music-wrapper-iterator.hh
+++ b/lily/include/music-wrapper-iterator.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1998--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -22,22 +22,23 @@ class Music_wrapper_iterator : public Music_iterator
 {
 public:
   VIRTUAL_COPY_CONS (Music_iterator);
+  DECLARE_SCHEME_CALLBACK(constructor, ());  
   Music_wrapper_iterator ();
   Music_wrapper_iterator (Music_wrapper_iterator const&);
-  ~Music_wrapper_iterator ();
 
-  virtual void construct_children  () ;
-  virtual Moment next_moment () const;
+  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 ();
-  virtual bool next ();
+  virtual SCM get_pending_events (Moment)const;
+  virtual void skip (Moment);
 
 protected:
-  virtual void do_print () const;
-  virtual void do_process (Moment);
+  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 */