[Gnash-commit] gnash ChangeLog server/character.h server/sprit...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/04/11 08:55:05

Modified files:
        .              : ChangeLog 
        server         : character.h sprite_instance.cpp 

Log message:
                * server/character.h: add protected set_event_handlers(), turn
                  get_event_handelrs into a protected member.
                * server/sprite_instance.cpp (duplicateMovieClip): simplified 
copying
                  of event handlers.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2843&r2=1.2844
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.230&r2=1.231

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2843
retrieving revision 1.2844
diff -u -b -r1.2843 -r1.2844
--- ChangeLog   11 Apr 2007 08:49:47 -0000      1.2843
+++ ChangeLog   11 Apr 2007 08:55:05 -0000      1.2844
@@ -1,5 +1,12 @@
 2007-04-11 Sandro Santilli <address@hidden>
 
+       * server/character.h: add protected set_event_handlers(), turn
+         get_event_handelrs into a protected member.
+       * server/sprite_instance.cpp (duplicateMovieClip): simplified copying
+         of event handlers.
+
+2007-04-11 Sandro Santilli <address@hidden>
+
        * testsuite/misc-ming.all/ming_utils.h: define newSWFAction
          to compileSWFActionCode when using older Ming versions.
          Now we can use them interxchangeably (the newer newSWFAction

Index: server/character.h
===================================================================
RCS file: /sources/gnash/gnash/server/character.h,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- server/character.h  6 Apr 2007 11:43:44 -0000       1.62
+++ server/character.h  11 Apr 2007 08:55:05 -0000      1.63
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: character.h,v 1.62 2007/04/06 11:43:44 strk Exp $ */
+/* $Id: character.h,v 1.63 2007/04/11 08:55:05 strk Exp $ */
 
 #ifndef GNASH_CHARACTER_H
 #define GNASH_CHARACTER_H
@@ -86,6 +86,16 @@
 
 protected:
 
+       const Events& get_event_handlers() const
+       {
+           return _event_handlers;
+       }
+       
+       void set_event_handlers(const Events& copyfrom) 
+       {
+               _event_handlers = copyfrom;
+       }
+
        /// Used to assign a name to unnamed instances
        static std::string getNextUnnamedInstanceName();
 
@@ -537,12 +547,6 @@
        ///
        virtual void get_mouse_state(int& x, int& y, int& buttons);
        
-       // TODO : make protected
-       const std::map<event_id, as_value>& get_event_handlers() const
-       {
-           return _event_handlers;
-       }
-
        /// These have been moved down from movie.h to remove that file
        /// from the inheritance chain. It is probably still a misdesign
        /// to require these functions for all characters.

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -b -r1.230 -r1.231
--- server/sprite_instance.cpp  10 Apr 2007 21:44:14 -0000      1.230
+++ server/sprite_instance.cpp  11 Apr 2007 08:55:05 -0000      1.231
@@ -1861,20 +1861,9 @@
        if ( initObject ) newsprite->copyProperties(*initObject);
        //else newsprite->copyProperties(*this);
 
-
        // Copy event handlers from sprite
        // We should not copy 'm_action_buffer' since the 'm_method' already 
contains it
-       const std::map<event_id, as_value>& sprite_events = 
get_event_handlers();
-       typedef std::map<event_id, as_value>::const_iterator event_iterator;
-       for (event_iterator it = sprite_events.begin(),
-               itEnd = sprite_events.end();
-               it != itEnd; ++it )
-       {
-               swf_event* e = new swf_event; // FIXME: who will delete this ?
-               e->m_event = it->first;
-               e->m_method = it->second;
-               e->attach_to(newsprite.get());
-       }
+       newsprite->set_event_handlers(get_event_handlers());
 
        parent->m_display_list.place_character(
                newsprite.get(),