[Gnash-commit] /srv/bzr/gnash/avm2 r9547: Remove MovieClip actionscript class, and use the one defined in sprite_instance.cpp.

[Tom Stellard]

------------------------------------------------------------
revno: 9547
committer: Tom Stellard <address@hidden>
branch nick: gnash_dev
timestamp: Sat 2008-09-06 19:14:20 +0800
message:
  Remove MovieClip actionscript class, and use the one defined in 
sprite_instance.cpp.
removed:
  libcore/asobj/flash/display/MovieClip_as.cpp
  libcore/asobj/flash/display/MovieClip_as.h
modified:
  libcore/asobj/Makefile.am
  libcore/asobj/flash/display_pkg.cpp

=== modified file 'libcore/asobj/Makefile.am'
--- a/libcore/asobj/Makefile.am 2008-09-01 21:25:03 +0000
+++ b/libcore/asobj/Makefile.am 2008-09-06 11:14:20 +0000
@@ -83,7 +83,6 @@
        xmlnode.cpp \
        XMLSocket_as.cpp \
        flash/display/BitmapData_as.cpp \
-       flash/display/MovieClip_as.cpp \
        flash/display_pkg.cpp \
        flash/external/ExternalInterface_as.cpp \
        flash/external_pkg.cpp \
@@ -162,7 +161,6 @@
        xmlattrs.h \
        xmlnode.h \
        flash/display/BitmapData_as.h \
-       flash/display/MovieClip_as.h \
        flash/display_pkg.h \
        flash/external/ExternalInterface_as.h \
        flash/external_pkg.h \

=== removed file 'libcore/asobj/flash/display/MovieClip_as.cpp'
--- a/libcore/asobj/flash/display/MovieClip_as.cpp      2008-08-30 12:13:17 
+0000
+++ b/libcore/asobj/flash/display/MovieClip_as.cpp      1970-01-01 00:00:00 
+0000
@@ -1,82 +0,0 @@
-// EventDispatcher.cpp:  Implementation of ActionScript MovieClip class, for 
Gnash.
-// 
-//   Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-// 
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-//
-
-#include "smart_ptr.h"
-#include "fn_call.h"
-#include "as_object.h" // for inheritance
-#include "builtin_function.h" // need builtin_function
-#include "Sprite_as.h"
-
-#include "log.h"
-
-#include <string>
-#include <sstream>
-
-namespace gnash {
-class movie_clip_as_object : public as_object
-{
-
-public:
-
-       movie_clip_as_object()
-               :
-               as_object()
-       {
-       }
-
-};
-
-static as_value
-movie_clip_ctor(const fn_call& fn)
-{
-       boost::intrusive_ptr<as_object> obj = new movie_clip_as_object();
-       
-       return as_value(obj.get()); // will keep alive
-}
-
-as_object*
-getMovieClipInterface()
-{
-       static boost::intrusive_ptr<as_object> o;
-       if ( ! o )
-       {
-               o = new as_object(getSpriteAsInterface());
-       }
-       return o.get();
-}
-
-// extern
-void movie_clip_class_init(as_object& global)
-{
-    static boost::intrusive_ptr<builtin_function> cl;
-
-       cl=new builtin_function(&movie_clip_ctor, getMovieClipInterface());
-       // Register _global.MovieClip
-       global.init_member("MovieClip", cl.get());
-
-}
-
-std::auto_ptr<as_object>
-init_movie_clip_instance()
-{
-       return std::auto_ptr<as_object>(new movie_clip_as_object);
-}
-
-
-}

=== removed file 'libcore/asobj/flash/display/MovieClip_as.h'
--- a/libcore/asobj/flash/display/MovieClip_as.h        2008-08-30 12:13:17 
+0000
+++ b/libcore/asobj/flash/display/MovieClip_as.h        1970-01-01 00:00:00 
+0000
@@ -1,44 +0,0 @@
-// 
-//   Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-// 
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-// 
-//
-//
-
-// Implementation for ActionScript MovieClip object.
-
-#ifndef GNASH_MOVIECLIP_AS_H
-#define GNASH_MOVIECLIP_AS_H
-
-#include <memory> // for auto_ptr
-
-namespace gnash {
-
-class as_object;
-
-/// Initialize the MovieClip class
-void movie_clip_class_init(as_object& global);
-
-/// Return a MovieClip instance
-std::auto_ptr<as_object> init_movie_clip_instance();
-
-as_object* getMovieClipInterface();
-
-
-}
-
-#endif // GNASH_MOVIECLIP_AS_H

=== modified file 'libcore/asobj/flash/display_pkg.cpp'
--- a/libcore/asobj/flash/display_pkg.cpp       2008-08-30 12:13:17 +0000
+++ b/libcore/asobj/flash/display_pkg.cpp       2008-09-06 11:14:20 +0000
@@ -25,7 +25,6 @@
 
 #include "flash/display/BitmapData_as.h"
 #include "Stage.h"
-#include "flash/display/MovieClip_as.h"
 
 namespace gnash {
 
@@ -38,7 +37,7 @@
 
        BitmapData_class_init(*pkg);
        stage_class_init(*pkg);
-       movie_clip_class_init(*pkg);
+       movieclip_class_init(*pkg);
 
        return pkg;
 }