--- a/ExtendedComboBox.st	Thu Mar 19 15:39:26 2015 +0100
+++ b/ExtendedComboBox.st	Thu Mar 19 16:11:17 2015 +0100
@@ -348,14 +348,14 @@
                               #name: 'CancelButton'
                               #label: 'Cancel'
                               #translateLabel: true
-                              #model: #cancel
+                              #model: #doCancel
                               #extent: #(#Point 165 26)
                           )
                            #(#ActionButtonSpec
                               #name: 'OKButton'
                               #label: 'OK'
                               #translateLabel: true
-                              #model: #accept
+                              #model: #doAccept
                               #extent: #(#Point 166 26)
                           )
                         )
@@ -377,6 +377,7 @@
     menu contents:(list at:sidx).
 
     widget := SubCanvas new.
+    widget client:(SimpleDialog new).
     widget spec:spec.
     menu menuWidget:widget.
     top open.
@@ -1289,7 +1290,7 @@
 !
 
 forwardEvent:ev withFocusOn:focusView
-    "handle a key press event
+    "handle an event
     "
     |view x y p syntheticEvent|
 
@@ -1321,6 +1322,13 @@
         ]
     ].
 
+    ev isKeyPressEvent ifTrue:[
+        ev key == #Escape ifTrue:[
+            self hideRequest.
+            ^ self.
+        ].
+    ].
+
     view := self detectViewAtX:x y:y.
     view isNil ifTrue:[
         ^ super dispatchEvent:ev withFocusOn:focusView delegate:false
@@ -1561,10 +1569,10 @@
 !ExtendedComboBox class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/ExtendedComboBox.st,v 1.71 2015-03-19 14:39:26 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/ExtendedComboBox.st,v 1.72 2015-03-19 15:11:17 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libwidg2/ExtendedComboBox.st,v 1.71 2015-03-19 14:39:26 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/ExtendedComboBox.st,v 1.72 2015-03-19 15:11:17 cg Exp $'
 ! !