--- a/ImageEditor.st	Fri Feb 26 11:16:00 2010 +0100
+++ b/ImageEditor.st	Fri Mar 05 00:32:11 2010 +0100
@@ -64,7 +64,8 @@
     editor := self new.
     editor allButOpen.
     aBlock value:editor.
-    editor openWindow
+    editor openWindow.
+    ^ editor
 !
 
 openModalOnClass: aClass andSelector: aSelector
@@ -79,8 +80,10 @@
     aClass isString ifTrue: [className := aClass].      
     aClass isNil    ifTrue: [className := ''].      
 
-    imageEditor postOpenAction: [imageEditView := imageEditor imageEditView. 
-                                 imageEditor loadFromOrPrepareForClass: aClass andSelector: aSelector].
+    imageEditor postOpenAction: [
+            imageEditView := imageEditor imageEditView. 
+            imageEditor loadFromOrPrepareForClass: aClass andSelector: aSelector
+        ].
     imageEditor openModal.
 
     resourceClass := imageEditView resourceClass.
@@ -94,10 +97,30 @@
     "
 !
 
+openModalOnImage:anImage
+    "opens a modal Image Editor on an image.
+     Returns the modified image or nil if unsaved/unchanged"
+
+    |imageEditor imageEditView newImage| 
+
+    imageEditor := self new.
+
+    imageEditor postOpenAction: [
+            imageEditView := imageEditor imageEditView. 
+            imageEditor loadFromImage: anImage
+        ].
+    imageEditor openModal.
+
+self halt.
+    ^ newImage
+!
+
 openOnClass:aClass andSelector:aSelector
     "opens an Image Editor on aClass and aSelector"
 
-    self openLoadingImageWith:[:editor | editor loadFromClass:aClass theNonMetaclass andSelector:aSelector.]
+    self openLoadingImageWith:[:editor | 
+        editor loadFromClass:aClass theNonMetaclass andSelector:aSelector.
+    ]
 
     "
      self openOnClass:self andSelector:#leftMouseKeyIcon
@@ -110,7 +133,9 @@
 openOnFile:aFileName
     "opens an Image Editor on aFileName"
 
-    self openLoadingImageWith:[:editor | editor loadFromFile:aFileName.]
+    self openLoadingImageWith:[:editor | 
+        editor loadFromFile:aFileName.
+    ]
 
     "
      self openOnFile: '../../goodies/bitmaps/gifImages/back.gif'
@@ -122,7 +147,9 @@
 openOnImage:anImage
     "opens an Image Editor on anImage"
 
-    self openLoadingImageWith:[:editor | editor loadFromImage: anImage.]
+    self openLoadingImageWith:[:editor | 
+        editor loadFromImage: anImage.
+    ]
 
     "
      self openOnImage: Icon startIcon
@@ -5260,7 +5287,7 @@
 
     img := self image.
     img isNil ifTrue:[
-        self warn:'No Image.'.
+        "/ self warn:'No Image.'.
         ^ nil
     ].
     clrIndex := self selectionOfColor value.