* lily/include/lily-guile.hh: is_x -> ly_c_X_p naming.

[lilypond.git] / lily / include / music-wrapper-iterator.hh

diff --git a/lily/include/music-wrapper-iterator.hh b/lily/include/music-wrapper-iterator.hh
index a488b8e2f73bd6367d4b64575ae9793c6f4c80e8..0befe300b0ebdde34d6d730b9bfa74bf8c737d46 100644 (file)
--- 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--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -21,23 +21,22 @@
 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 ();
 
-  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 */