--- a/DialogBox.st	Sat Apr 02 17:08:19 2016 +0200
+++ b/DialogBox.st	Sat Apr 02 17:08:35 2016 +0200
@@ -9749,7 +9749,7 @@
         borderWidth:0;
         horizontalLayout:#spread.
 
-    buttonPanel rightInset:(self device extentOfResizeHandle x).
+    buttonPanel rightInset:(device extentOfResizeHandle x).
     "/ some viewStyles want ok to be the leftMost button.
     buttonPanel reverseOrderIfOKAtLeft:true.
 
@@ -10293,7 +10293,7 @@
     ^ ApplicationModel
         specificationFor:aKey 
         application:self
-        onDevice:(self graphicsDevice)
+        onDevice:(device)
 ! !
 
 !DialogBox methodsFor:'user actions'!