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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/01/11 12:15:03

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

Log message:
                * server/asobj/ContextMenu.cpp: fixed method cases
                * testsuite/actionscript.all/ContextMenu.as: fix taking
                  SWF version into account.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2081&r2=1.2082
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/ContextMenu.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/ContextMenu.as?cvsroot=gnash&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2081
retrieving revision 1.2082
diff -u -b -r1.2081 -r1.2082
--- ChangeLog   11 Jan 2007 11:56:20 -0000      1.2081
+++ ChangeLog   11 Jan 2007 12:15:02 -0000      1.2082
@@ -1,5 +1,8 @@
 2007-01-11 Sandro Santilli <address@hidden>
 
+       * server/asobj/ContextMenu.cpp: fixed method cases
+       * testsuite/actionscript.all/ContextMenu.as: fix taking
+         SWF version into account.
        * server/asobj/SharedObject.cpp: fixed method cases
        * testsuite/actionscript.all/SharedObject.as: fix taking
          SWF version into account.

Index: server/asobj/ContextMenu.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/ContextMenu.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/asobj/ContextMenu.cpp        20 Nov 2006 21:28:58 -0000      1.4
+++ server/asobj/ContextMenu.cpp        11 Jan 2007 12:15:02 -0000      1.5
@@ -37,7 +37,7 @@
 attachContextMenuInterface(as_object& o)
 {
        o.set_member("copy", &contextmenu_copy);
-       o.set_member("hidebuiltinitems", &contextmenu_hidebuiltinitems);
+       o.set_member("hideBuiltInItems", &contextmenu_hidebuiltinitems);
 }
 
 static as_object*

Index: testsuite/actionscript.all/ContextMenu.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/ContextMenu.as,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- testsuite/actionscript.all/ContextMenu.as   22 Nov 2006 10:04:37 -0000      
1.7
+++ testsuite/actionscript.all/ContextMenu.as   11 Jan 2007 12:15:03 -0000      
1.8
@@ -20,25 +20,31 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: ContextMenu.as,v 1.7 2006/11/22 10:04:37 strk Exp $";
+rcsid="$Id: ContextMenu.as,v 1.8 2007/01/11 12:15:03 strk Exp $";
 
 #include "check.as"
 
-#if OUTPUT_VERSION >= 7
+#if OUTPUT_VERSION < 7
 
+// there was no ContextMenu before SWF7, still
+// it seems the player allows instantiating one (?)
+xcheck_equals(typeof(ContextMenu), 'function');
 var contextmenuObj = new ContextMenu;
+xcheck_equals (typeof(contextmenuObj), 'object');
 
-// test the ContextMenu constuctor
-check (contextmenuObj != undefined);
+#else // OUTPUT_VERSION >= 7
 
-// test the ContextMenu::copy method
-check (contextmenuObj.copy != undefined);
-// test the ContextMenu::hidebuiltinitems method
-check (contextmenuObj.hidebuiltinitems != undefined);
+// there was no ContextMenu before SWF7
+check_equals(typeof(ContextMenu), 'function');
+
+var contextmenuObj = new ContextMenu;
 
-#else
+// test the ContextMenu constuctor
+check_equals (typeof(contextmenuObj), 'object');
 
-// there was no ContextMenu before SWF7
-xcheck_equals(ContextMenu, undefined);
+// test the ContextMenu::copy method
+check_equals (typeof(contextmenuObj.copy), 'function');
+// test the ContextMenu::hideBuiltinItems method
+check_equals (typeof(contextmenuObj.hideBuiltInItems), 'function');
 
 #endif