[Gnash-commit] gnash ChangeLog server/sprite_instance.cpp test...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/03/28 20:52:37

Modified files:
        .              : ChangeLog 
        server         : sprite_instance.cpp 
        testsuite/actionscript.all: MovieClip.as 

Log message:
                * server/sprite_instance.cpp (add_textfield): return void.
                * testsuite/actionscript.all/MovieClip.as: add tests for
                  createTextField().

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2705&r2=1.2706
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.207&r2=1.208
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.39&r2=1.40

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2705
retrieving revision 1.2706
diff -u -b -r1.2705 -r1.2706
--- ChangeLog   28 Mar 2007 20:38:35 -0000      1.2705
+++ ChangeLog   28 Mar 2007 20:52:37 -0000      1.2706
@@ -1,5 +1,11 @@
 2007-03-28 Sandro Santilli <address@hidden>
 
+       * server/sprite_instance.cpp (add_textfield): return void.
+       * testsuite/actionscript.all/MovieClip.as: add tests for
+         createTextField().
+
+2007-03-28 Sandro Santilli <address@hidden>
+
        * server/sprite_instance.cpp (add_textfield): use edit_text_character,
          not simple text_character (the latter has all the ActionScript
          methods attached to it).

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -b -r1.207 -r1.208
--- server/sprite_instance.cpp  28 Mar 2007 20:38:35 -0000      1.207
+++ server/sprite_instance.cpp  28 Mar 2007 20:52:37 -0000      1.208
@@ -32,7 +32,6 @@
 #include "MovieClipLoader.h" // @@ temp hack for loading tests
 #include "as_value.h"
 #include "as_function.h"
-//#include "text_character_def.h" // @@ temp hack for createTextField exp.
 #include "edit_text_character_def.h" // @@ temp hack for createTextField exp.
 #include "execute_tag.h"
 #include "fn_call.h"
@@ -771,9 +770,8 @@
        boost::intrusive_ptr<character> txt = sprite->add_textfield(txt_name,
                        txt_depth, txt_x, txt_y, txt_width, txt_height);
 
-       // We should return a ref to the newly created
-       // TextField here
-       return as_value(txt.get());
+       // createTextField returns void, it seems
+       return as_value(); 
 }
 
 //getNextHighestDepth() : Number

Index: testsuite/actionscript.all/MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- testsuite/actionscript.all/MovieClip.as     25 Mar 2007 09:05:58 -0000      
1.39
+++ testsuite/actionscript.all/MovieClip.as     28 Mar 2007 20:52:37 -0000      
1.40
@@ -22,7 +22,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClip.as,v 1.39 2007/03/25 09:05:58 strk Exp $";
+rcsid="$Id: MovieClip.as,v 1.40 2007/03/28 20:52:37 strk Exp $";
 
 #include "check.as"
 
@@ -380,3 +380,17 @@
 check_equals(b, "/");
 
 #endif // MING_SUPPORT_ASM_GETPROPERTY
+
+//------------------------------------------------
+// Test createTextField
+//------------------------------------------------
+
+t = createTextField("textfieldTest", 3, 0, 100, 100, 100);
+check_equals(typeof(t), 'undefined');
+#if OUTPUT_VERSION > 5
+check_equals(typeof(textfieldTest), 'object');
+check(textfieldTest instanceof TextField);
+#else
+xcheck_equals(typeof(textfieldTest), 'movieclip');
+xcheck(textfieldTest instanceof MovieClip);
+#endif