[Gnash-commit] /srv/bzr/gnash/trunk r12257: Add minor cleanup commit missing from last revision (make functions

[Benjamin Wolsey]

------------------------------------------------------------
revno: 12257 [merge]
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Fri 2010-06-18 11:46:12 +0200
message:
  Add minor cleanup commit missing from last revision (make functions
  protected).
modified:
  libcore/Button.h
  libcore/MovieClip.h

=== modified file 'libcore/Button.h'
--- a/libcore/Button.h  2010-06-17 09:36:43 +0000
+++ b/libcore/Button.h  2010-06-18 09:32:57 +0000
@@ -114,9 +114,6 @@
        bool pointInShape(boost::int32_t x, boost::int32_t y) const;
 
        bool isEnabled();
-       
-       /// Properly unload contained DisplayObjects
-       virtual bool unloadChildren();
 
        /// Properly destroy contained DisplayObjects
        void destroy();
@@ -137,6 +134,9 @@
 #endif
 
 protected:
+       
+       /// Properly unload contained DisplayObjects
+       virtual bool unloadChildren();
 
 #ifdef GNASH_USE_GC
        /// Mark reachabe resources (for the GC)

=== modified file 'libcore/MovieClip.h'
--- a/libcore/MovieClip.h       2010-06-17 09:36:43 +0000
+++ b/libcore/MovieClip.h       2010-06-18 09:32:57 +0000
@@ -383,10 +383,6 @@
     ///     registered class and adding properties.
     virtual void construct(as_object* initObj = 0);
 
-    /// Unload all contents in the displaylist and this instance
-    /// See DisplayObject::unload for more info
-    virtual bool unloadChildren();
-
     /// Mark this sprite as destroyed
     //
     /// This is an override of DisplayObject::destroy()
@@ -704,6 +700,11 @@
 
 protected:
 
+    /// Unload all contents in the displaylist and this instance
+    //
+    /// Return true if there was an unloadHandler.
+    virtual bool unloadChildren();
+
     /// Mark sprite-specific reachable resources.
     //
     /// sprite-specific reachable resources are: