--- a/ScrollBar.st	Tue Feb 18 16:08:31 2014 +0100
+++ b/ScrollBar.st	Tue Feb 18 16:09:53 2014 +0100
@@ -822,7 +822,7 @@
     style := styleSheet name.
     ((style = #iris) and:[Screen current hasGrayscales]) ifTrue:[
         "have to change some of Buttons defaults"
-        clr := (Color gray:25) onDevice:device.
+        clr := (Color gray:25) onDevice:self graphicsDevice.
         button1 passiveLevel:2.
         button2 passiveLevel:2.
         button1 foregroundColor:clr.
@@ -847,7 +847,7 @@
         button2 backgroundColor:clr.
         button1 activeBackgroundColor:clr.
         button2 activeBackgroundColor:clr.
-        device hasGrayscales ifFalse:[
+        self graphicsDevice hasGrayscales ifFalse:[
             button1 activeForegroundColor:Black.
             button2 activeForegroundColor:Black.
         ]
@@ -913,7 +913,7 @@
             ^ self
         ].
         (buttonLayout == #bottom) ifTrue:[
-            device supportsViewGravity ifTrue:[
+            self graphicsDevice supportsViewGravity ifTrue:[
                 button1 viewGravity:#South. 
                 button2 viewGravity:#South. 
                 thumb viewGravity:#North.
@@ -969,21 +969,21 @@
 
 updateNativeWidget
     self isNativeWidget ifTrue:[
-        drawableId notNil ifTrue:[
-            device 
+        self drawableId notNil ifTrue:[
+            self graphicsDevice
                 setScrollRange:0 to:100 
                 redraw:false 
-                in:drawableId.
+                in:self drawableId.
 
-            device 
+            self graphicsDevice
                 setScrollPosition:thumb thumbOrigin rounded 
                 redraw:false 
-                in:drawableId.
+                in:self drawableId.
 
-            device 
+            self graphicsDevice
                 setScrollBarPageSize:thumb thumbHeight rounded 
                 redraw:true 
-                in:drawableId.
+                in:self drawableId.
         ]
     ].
 ! !
@@ -1030,7 +1030,7 @@
     button2 enabled:e2. "/ e2 ifTrue:[button2 enable] ifFalse:[button2 disable].
 
     self isNativeWidget ifTrue:[
-        drawableId notNil ifTrue:[
+        self drawableId notNil ifTrue:[
             e1 ifTrue:[
                 e2 ifTrue:[
                     "/ both enabled
@@ -1045,7 +1045,7 @@
                     ena := #DISABLE_BOTH.
                 ]
             ].
-            device enableScrollBar:ena in:drawableId.
+            self graphicsDevice enableScrollBar:ena in:self drawableId.
         ].
     ].
 
@@ -1130,11 +1130,11 @@
     style := styleSheet name.
 
     orientation == #horizontal ifTrue:[
-        form1 := ArrowButton leftArrowButtonForm:style on:device.
-        form2 := ArrowButton rightArrowButtonForm:style on:device.
+        form1 := ArrowButton leftArrowButtonForm:style on:self graphicsDevice.
+        form2 := ArrowButton rightArrowButtonForm:style on:self graphicsDevice.
     ] ifFalse:[
-        form1 := ArrowButton upArrowButtonForm:style on:device.
-        form2 := ArrowButton downArrowButtonForm:style on:device.
+        form1 := ArrowButton upArrowButtonForm:style on:self graphicsDevice.
+        form2 := ArrowButton downArrowButtonForm:style on:self graphicsDevice.
     ].
     form1 isNil ifTrue:[
         height1 := width1 := 16.
@@ -1179,10 +1179,10 @@
 !ScrollBar class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/ScrollBar.st,v 1.90 2013-06-25 23:04:17 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/ScrollBar.st,v 1.91 2014-02-18 15:09:53 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libwidg/ScrollBar.st,v 1.90 2013-06-25 23:04:17 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/ScrollBar.st,v 1.91 2014-02-18 15:09:53 stefan Exp $'
 ! !