Browse Source

no variance nor type parameter on filters.

Nicolas Cannasse 19 years ago
parent
commit
f171df0f0d
2 changed files with 2 additions and 15 deletions
  1. 1 14
      std/flash/MovieClip.hx
  2. 1 1
      std/flash9/display/DisplayObject.hx

+ 1 - 14
std/flash/MovieClip.hx

@@ -134,7 +134,7 @@ implements Dynamic
 	function onUnload() : Void;
 	function onUnload() : Void;
 
 
 #if flash8
 #if flash8
-	var filters : Array<+flash.filters.BitmapFilter>;
+	var filters : Array<Dynamic>; // does not use variance here.
 	var blendMode : Dynamic;
 	var blendMode : Dynamic;
 	var cacheAsBitmap : Bool;
 	var cacheAsBitmap : Bool;
 	var opaqueBackground : Int;
 	var opaqueBackground : Int;
@@ -150,8 +150,6 @@ implements Dynamic
 	function beginBitmapFill( bmp : flash.display.BitmapData , ?matrix:flash.geom.Matrix, ?repeat:Bool, ?smoothing:Bool ) : Void;
 	function beginBitmapFill( bmp : flash.display.BitmapData , ?matrix:flash.geom.Matrix, ?repeat:Bool, ?smoothing:Bool ) : Void;
   	function lineGradientStyle( fillType:String, colors:Array<Int>, alphas:Array<+Float>, ratios:Array<+Float>, matrix:Dynamic, ?spreadMethod : String, ?interpolationMethod:String, ?focalPointRatio:Float ) : Void;
   	function lineGradientStyle( fillType:String, colors:Array<Int>, alphas:Array<+Float>, ratios:Array<+Float>, matrix:Dynamic, ?spreadMethod : String, ?interpolationMethod:String, ?focalPointRatio:Float ) : Void;
 	
 	
-	function addFilter( f : flash.filters.BitmapFilter ) : Void;
-	function removeFilter( f : flash.filters.BitmapFilter ) : Bool;
 #end
 #end
 
 
 // MT extension
 // MT extension
@@ -160,17 +158,6 @@ implements Dynamic
 #end
 #end
 	private static function __init__() : Void untyped {
 	private static function __init__() : Void untyped {
 		flash.MovieClip = _global["MovieClip"];
 		flash.MovieClip = _global["MovieClip"];
-		flash.MovieClip.prototype[cast "addFilter"] = function(f) {
-			var fl = this.filters;
-			fl.push(f);
-			this.filters = fl;
-		};
-		flash.MovieClip.prototype[cast "removeFilter"] = function(f) {
-			var fl = this.filters;
-			var b = fl.remove(f);
-			this.filters = fl;
-			return b;
-		};
 	}
 	}
 
 
 }
 }

+ 1 - 1
std/flash9/display/DisplayObject.hx

@@ -5,7 +5,7 @@ extern class DisplayObject extends flash.events.EventDispatcher, implements IBit
 	var alpha : Float;
 	var alpha : Float;
 	var blendMode : BlendMode;
 	var blendMode : BlendMode;
 	var cacheAsBitmap : Bool;
 	var cacheAsBitmap : Bool;
-	var filters : Array<+flash.filters.BitmapFilter>;
+	var filters : Array<Dynamic>; // does not use variance here
 	function getBounds(targetCoordinateSpace : DisplayObject) : flash.geom.Rectangle;
 	function getBounds(targetCoordinateSpace : DisplayObject) : flash.geom.Rectangle;
 	function getRect(targetCoordinateSpace : DisplayObject) : flash.geom.Rectangle;
 	function getRect(targetCoordinateSpace : DisplayObject) : flash.geom.Rectangle;
 	function globalToLocal(point : flash.geom.Point) : flash.geom.Point;
 	function globalToLocal(point : flash.geom.Point) : flash.geom.Point;