[Gnash-commit] gnash ChangeLog server/asobj/Mouse.cpp testsuit...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/08/08 16:26:45

Modified files:
        .              : ChangeLog 
        server/asobj   : Mouse.cpp 
        testsuite/actionscript.all: Mouse.as 

Log message:
                * server/asobj/Mouse.cpp: make the global Mouse symbol point
                  to an object, not a constructor.
                * testsuite/actionscript.all/Mouse.as: xcheck -> check.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3964&r2=1.3965
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Mouse.cpp?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Mouse.as?cvsroot=gnash&r1=1.10&r2=1.11

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3964
retrieving revision 1.3965
diff -u -b -r1.3964 -r1.3965
--- ChangeLog   8 Aug 2007 10:39:49 -0000       1.3964
+++ ChangeLog   8 Aug 2007 16:26:44 -0000       1.3965
@@ -1,3 +1,9 @@
+2007-08-08 Sandro Santilli <address@hidden>
+
+       * server/asobj/Mouse.cpp: make the global Mouse symbol point
+         to an object, not a constructor.
+       * testsuite/actionscript.all/Mouse.as: xcheck -> check.
+
 2007-08-08 Tomas Groth Christensen <address@hidden>
 
        * backend/sound_handler_{sdl,gst}.cpp: Detect and fix if a soundstream

Index: server/asobj/Mouse.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Mouse.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/asobj/Mouse.cpp      13 Jul 2007 19:24:15 -0000      1.12
+++ server/asobj/Mouse.cpp      8 Aug 2007 16:26:45 -0000       1.13
@@ -27,6 +27,7 @@
 #include "fn_call.h"
 #include "smart_ptr.h" // for boost intrusive_ptr
 #include "builtin_function.h" // need builtin_function
+//#include "VM.h" // for registering static
 
 namespace gnash {
 
@@ -145,19 +146,18 @@
 void mouse_class_init(as_object& global)
 {
        // This is going to be the global Mouse "class"/"function"
-       static boost::intrusive_ptr<builtin_function> cl;
+       static boost::intrusive_ptr<as_object> obj;
 
-       if ( cl == NULL )
+       if ( ! obj )
        {
-               cl=new builtin_function(&mouse_ctor, getMouseInterface());
-               // replicate all interface to class, to be able to access
-               // all methods as static functions
-               attachMouseInterface(*cl);
-                    
+               obj = new mouse_as_object();
+               // we shouldn't keep the Mouse object
+               // alive, I think.
+               //VM::get().addStatic(obj.get());
        }
 
        // Register _global.Mouse
-       global.init_member("Mouse", cl.get());
+       global.init_member("Mouse", obj.get());
 
 }
 

Index: testsuite/actionscript.all/Mouse.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Mouse.as,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- testsuite/actionscript.all/Mouse.as 26 Jul 2007 03:41:19 -0000      1.10
+++ testsuite/actionscript.all/Mouse.as 8 Aug 2007 16:26:45 -0000       1.11
@@ -20,15 +20,15 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Mouse.as,v 1.10 2007/07/26 03:41:19 strk Exp $";
+rcsid="$Id: Mouse.as,v 1.11 2007/08/08 16:26:45 strk Exp $";
 
 #include "check.as"
 
-xcheck_equals ( typeof(Mouse), 'object' );
+check_equals ( typeof(Mouse), 'object' );
 
 // Mouse object can't be instanciated !
 var mouseObj = new Mouse;
-xcheck_equals(mouseObj, undefined);
+check_equals(mouseObj, undefined);
 
 // test the Mouse::hide method
 check_equals ( typeof(Mouse.hide), 'function' );