[Gnash-commit] gnash/server action_buffer.h gnash.h impl.h

[Vitaly Alexeev]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Vitaly Alexeev <alexeev>        06/06/21 08:46:03

Modified files:
        server         : action_buffer.h gnash.h impl.h 

Log message:
        added multi-event handler, like on(release, press, ...)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/action_buffer.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/gnash.h?cvsroot=gnash&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/gnash/server/impl.h?cvsroot=gnash&r1=1.28&r2=1.29

Patches:
Index: action_buffer.h
===================================================================
RCS file: /sources/gnash/gnash/server/action_buffer.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- action_buffer.h     20 Jun 2006 11:12:36 -0000      1.1
+++ action_buffer.h     21 Jun 2006 08:46:03 -0000      1.2
@@ -103,13 +103,17 @@
 
        int     get_length() const { return m_buffer.size(); }
 
+       void operator=(const action_buffer& a)
+       {
+               m_buffer.assign(a.m_buffer.begin(), a.m_buffer.end());
+       }
+
 private:
        // Don't put these as values in std::vector<>!  They contain
        // internal pointers and cannot be moved or copied.
        // If you need to keep an array of them, keep pointers
        // to new'd instances.
        action_buffer(const action_buffer& a) { assert(0); }
-       void operator=(const action_buffer& a) { assert(0); }
 
        void    process_decl_dict(int start_pc, int stop_pc);
 

Index: gnash.h
===================================================================
RCS file: /sources/gnash/gnash/server/gnash.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- gnash.h     12 Jun 2006 17:23:30 -0000      1.31
+++ gnash.h     21 Jun 2006 08:46:03 -0000      1.32
@@ -77,7 +77,7 @@
 
 namespace gnash {
 // Forward declarations.
-struct action_buffer;
+class action_buffer;
 struct as_value;
 struct bitmap_info;
 class character;

Index: impl.h
===================================================================
RCS file: /sources/gnash/gnash/server/impl.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- impl.h      20 Jun 2006 11:12:36 -0000      1.28
+++ impl.h      21 Jun 2006 08:46:03 -0000      1.29
@@ -62,7 +62,7 @@
 namespace gnash {
 
 // Forward declarations
-struct action_buffer;
+class action_buffer;
 struct bitmap_character_def;
 struct bitmap_info;
 class character;
@@ -170,8 +170,6 @@
            ch->set_event_handler(m_event, m_method);
        }
 
-    void read(stream* in, uint32_t flags);
-
 private:
     // DON'T USE THESE
     swf_event(const swf_event& s) { assert(0); }