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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/11/28 09:02:23

Modified files:
        .              : ChangeLog 
        server/asobj   : Key.cpp 

Log message:
        register native Key methods.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4991&r2=1.4992
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Key.cpp?cvsroot=gnash&r1=1.46&r2=1.47

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4991
retrieving revision 1.4992
diff -u -b -r1.4991 -r1.4992
--- ChangeLog   28 Nov 2007 08:26:16 -0000      1.4991
+++ ChangeLog   28 Nov 2007 09:02:23 -0000      1.4992
@@ -1,5 +1,6 @@
 2007-11-28 Sandro Santilli <address@hidden>
 
+       * server/asobj/Key.cpp: register native Key methods.
        * configure.ac: look for QT libs if kde gui is requested;
          don't bail out if QTOPIA is not found, unless qtopia gui is
          requested.

Index: server/asobj/Key.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Key.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- server/asobj/Key.cpp        20 Nov 2007 10:31:39 -0000      1.46
+++ server/asobj/Key.cpp        28 Nov 2007 09:02:23 -0000      1.47
@@ -27,7 +27,7 @@
 #include "fn_call.h"
 #include "movie_root.h"
 #include "action.h" // for call_method
-#include "VM.h"
+#include "VM.h" // for registerNative
 #include "builtin_function.h"
 #include "Object.h" // for getObjectInterface()
 #include "AsBroadcaster.h" // for initializing self as a broadcaster
@@ -227,20 +227,20 @@
     KEY_CONST(UP);
 
     // methods
-    key_obj->init_member("getAscii", new builtin_function(key_get_ascii));
-    key_obj->init_member("getCode", new builtin_function(key_get_code));
-    key_obj->init_member("isDown", new builtin_function(key_is_down));
-    key_obj->init_member("isToggled", new builtin_function(key_is_toggled));
 
-    // These are only for SWF6 and up
-#if 0 // done by AsBroadcaster
-    int swfversion = VM::get().getSWFVersion();
-    if ( swfversion > 5 )
-    {
-        key_obj->init_member("addListener", new 
builtin_function(key_add_listener));
-        key_obj->init_member("removeListener", new 
builtin_function(key_remove_listener));
-    }
-#endif
+    VM& vm = global.getVM();
+
+    vm.registerNative(key_get_ascii, 800, 0);
+    key_obj->init_member("getAscii", vm.getNative(800, 0));
+
+    vm.registerNative(key_get_code, 800, 1);
+    key_obj->init_member("getCode", vm.getNative(800, 1));
+
+    vm.registerNative(key_is_down, 800, 2);
+    key_obj->init_member("isDown", vm.getNative(800, 2));
+
+    vm.registerNative(key_is_toggled, 800, 3);
+    key_obj->init_member("isToggled", vm.getNative(800, 3));
 
     global.init_member("Key", key_obj);
 }