--- a/SourceCodeManagerUtilitiesForContainerBasedManagers.st	Wed Feb 19 14:06:05 2014 +0100
+++ b/SourceCodeManagerUtilitiesForContainerBasedManagers.st	Wed Feb 19 21:53:42 2014 +0100
@@ -516,7 +516,8 @@
 checkinPackage:packageToCheckIn classes:doClasses extensions:doExtensions buildSupport:doBuild askForMethodsInOtherPackages:askForMethodsInOtherPackages
     |mgr classesToCheckIn methodsToCheckIn methodsInPrjDef
      methodsInOtherPackages looseMethods otherPackages
-     msg classesInChangeSet newClasses checkinInfo originalCheckinInfo classesToTag|
+     msg classesInChangeSet newClasses checkinInfo originalCheckinInfo classesToTag
+     answer|
 
     mgr := self sourceCodeManagerFor: packageToCheckIn.
 
@@ -598,13 +599,22 @@
                 methodsInPrjDef  := packageToCheckIn asPackageId projectDefinitionClass extensionMethods.
                 methodsInPrjDef := methodsInPrjDef reject:[:m | m isNil].
                 methodsInPrjDef asSet ~= methodsToCheckIn asSet ifTrue:[
-                    (Dialog 
-                        confirm:('Set of methods in image is different from what is specified in the project definition.\Check in image methods (%1) or definition methods (%2)?'
+                    answer:= Dialog 
+                        confirmWithCancel:('Set of methods in image is different from what is specified in the project definition.\Check in image methods (%1) or definition methods (%2)?'
                                         bindWith: methodsToCheckIn size
                                         with: methodsInPrjDef size)
-                        yesLabel:'Image Methods' 
-                        noLabel:'Definition Methods'
-                    ) ifFalse:[
+                        labels:#('Image Methods' 'Definition Methods' 'Cancel') 
+                        values:#(true false nil) 
+                        default:nil.
+
+"/                    answer := Dialog 
+"/                        confirm:('Set of methods in image is different from what is specified in the project definition.\Check in image methods (%1) or definition methods (%2)?'
+"/                                        bindWith: methodsToCheckIn size
+"/                                        with: methodsInPrjDef size)
+"/                        yesLabel:'Image Methods' 
+"/                        noLabel:'Definition Methods'.
+                    answer isNil ifTrue:[AbortOperationRequest raise].
+                    answer ifFalse:[
                         methodsToCheckIn := methodsInPrjDef.
                     ].
                 ].
@@ -793,10 +803,10 @@
 !SourceCodeManagerUtilitiesForContainerBasedManagers class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilitiesForContainerBasedManagers.st,v 1.18 2013-09-18 11:01:02 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilitiesForContainerBasedManagers.st,v 1.19 2014-02-19 20:53:42 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilitiesForContainerBasedManagers.st,v 1.18 2013-09-18 11:01:02 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilitiesForContainerBasedManagers.st,v 1.19 2014-02-19 20:53:42 cg Exp $'
 ! !