      */
     override public function updateDisplayList(w:Number, h:Number):void
     {  
-        var scroller:FxScroller = getScroller();
+        var scroller:Scroller = getScroller();
         if (!scroller) 
             return;
             
         var viewport:IViewport = scroller.viewport;
-        var hsb:FxScrollBar = scroller.horizontalScrollBar;
-        var vsb:FxScrollBar = scroller.verticalScrollBar;
+        var hsb:ScrollBar = scroller.horizontalScrollBar;
+        var vsb:ScrollBar = scroller.verticalScrollBar;
         var hsbElt:ILayoutElement = LayoutElementFor(hsb);
         var vsbElt:ILayoutElement = LayoutElementFor(vsb);
            

     */
    override public function measure():void
    {
        var scroller:FxScroller = getScroller();
        if (!scroller) 
            return;
            

            measuredH = viewportElt.getPreferredBoundsHeight();
        }
        
        var hsb:ScrollBar = scroller.horizontalScrollBar;
        var showHSB:Boolean = false;
        switch(scroller.horizontalScrollPolicy) {
            case ScrollPolicy.ON: 
