[Actionstep-commits] actionstep/src/org/actionstep NSWindow.as,1.19,1.20 NSView.as,1.25,1.26 ASRootWindowView.as,1.11,1.12

[Richard K. <ric...@us...>]

Update of /cvsroot/actionstep/actionstep/src/org/actionstep
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12900

Modified Files:
	NSWindow.as NSView.as ASRootWindowView.as 
Log Message:
change release to use removeFromSuperview for root windows

Index: ASRootWindowView.as
===================================================================
RCS file: /cvsroot/actionstep/actionstep/src/org/actionstep/ASRootWindowView.as,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ASRootWindowView.as	8 Jul 2005 01:36:54 -0000	1.11
--- ASRootWindowView.as	13 Jul 2005 15:49:53 -0000	1.12
***************
*** 138,141 ****
--- 138,145 ----
      }
    }
+   
+   public function removeFromSuperview() {
+     removeMovieClips();
+   }
  
    private function updateFrameMovieClipSize():Void {

Index: NSView.as
===================================================================
RCS file: /cvsroot/actionstep/actionstep/src/org/actionstep/NSView.as,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** NSView.as	13 Jul 2005 09:49:18 -0000	1.25
--- NSView.as	13 Jul 2005 15:49:53 -0000	1.26
***************
*** 235,238 ****
--- 235,239 ----
        m_subviews[i].removeMovieClips();
      }
+     release();
      m_mcFrame.removeMovieClip();
      m_mcFrame = null;
***************
*** 1048,1059 ****
    }
    
!   public function release():Boolean {
!   	var x:Array = m_subviews, result:Boolean = true;
!   	for(var i in x) {
!   		result = result && x[i].release();
!   	}
!   	m_mcFrame.removeMovieClip();
!   	m_mcBounds.removeMovieClip();
!   	return (m_mcFrame==m_mcBounds==null && result) ? true : false;
    }
  }
\ No newline at end of file
--- 1049,1054 ----
    }
    
!   public function release() {
!     // Override 
    }
  }
\ No newline at end of file

Index: NSWindow.as
===================================================================
RCS file: /cvsroot/actionstep/actionstep/src/org/actionstep/NSWindow.as,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** NSWindow.as	13 Jul 2005 09:51:48 -0000	1.19
--- NSWindow.as	13 Jul 2005 15:49:53 -0000	1.20
***************
*** 544,553 ****
  	
  	public function release():Boolean {
! 		var x = m_rootView.release();
! 		var y = m_contentView.release();
! 		
! 		if(x==y==true)	return true;
! 		
! 		return false;
  	}
    
--- 544,549 ----
  	
  	public function release():Boolean {
! 	  m_rootView.removeFromSuperview();
! 	  return true;
  	}