--- a/RadioButton.st	Sat Apr 02 17:08:56 2016 +0200
+++ b/RadioButton.st	Sat Apr 02 17:08:57 2016 +0200
@@ -852,7 +852,7 @@
     id := gc drawableId.
     id notNil ifTrue:[
         self isNativeWidget ifTrue:[
-            self graphicsDevice changeButtonState:false in:id.
+            device changeButtonState:false in:id.
         ].
     ].
 !
@@ -864,7 +864,7 @@
     id := gc drawableId.
     id notNil ifTrue:[
         self isNativeWidget ifTrue:[
-            self graphicsDevice changeButtonState:true in:id.
+            device changeButtonState:true in:id.
         ].
     ].
 ! !
@@ -938,7 +938,7 @@
     ].
 
     imgTopHeight := 0.
-    graphicsDevice := self graphicsDevice.
+    graphicsDevice := device.
 
     imgTop notNil ifTrue:[imgTop := imgTop onDevice:graphicsDevice. imgTopHeight := imgTop height].
     imgBot notNil ifTrue:[imgBot := imgBot onDevice:graphicsDevice].
@@ -1057,7 +1057,7 @@
             |graphicsDevice|
 
             self isNativeWidget ifFalse:[
-                graphicsDevice := self graphicsDevice.
+                graphicsDevice := device.
                 buttonOnImage := self class roundOnForm.
                 buttonOnImage notNil ifTrue:[ buttonOnImage := buttonOnImage onDevice:graphicsDevice].
                 buttonOffImage := self class roundOffForm.