--- a/Tools_NavigationState.st	Fri Feb 10 17:12:56 2006 +0100
+++ b/Tools_NavigationState.st	Fri Feb 10 18:07:30 2006 +0100
@@ -98,17 +98,13 @@
 !
 
 canvas
-    "return the value of the instance variable 'canvas' (automatically generated)"
-
     ^ canvas
 !
 
 canvas:something
-    "set the value of the instance variable 'canvas' (automatically generated)"
-
     canvas := something.
     canvasType isNil ifTrue:[
-	canvasType := something spec
+        canvasType := something spec
     ].
 !
 
@@ -145,23 +141,6 @@
     "Created: / 11.2.2000 / 12:43:45 / cg"
 !
 
-codeView
-    |builder v|
-
-    canvas notNil ifTrue:[
-        builder := canvas builder.
-        builder notNil ifTrue:[
-            v := builder componentAt:#CodeView.
-            v notNil ifTrue:[
-                ^ v scrolledView
-            ].
-        ]
-    ].
-    ^ nil
-
-    "Created: / 11.2.2000 / 13:28:25 / cg"
-!
-
 environment
     ^ Smalltalk
 !
@@ -292,6 +271,37 @@
 
 ! !
 
+!NavigationState methodsFor:'accessing-subViews'!
+
+codeView
+    |builder v|
+
+    canvas notNil ifTrue:[
+        builder := canvas builder.
+        builder notNil ifTrue:[
+            v := builder componentAt:#CodeView.
+            v notNil ifTrue:[
+                ^ v scrolledView
+            ].
+        ]
+    ].
+    ^ nil
+
+    "Created: / 11.2.2000 / 13:28:25 / cg"
+!
+
+imageEditor
+    |builder|
+
+    canvas notNil ifTrue:[
+        builder := canvas builder.
+        builder notNil ifTrue:[
+            ^ (builder componentAt:#ImageEditorSubCanvas) application.
+        ]
+    ].
+    ^ nil
+! !
+
 !NavigationState methodsFor:'aspects'!
 
 categoryList
@@ -1142,5 +1152,5 @@
 !NavigationState class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools_NavigationState.st,v 1.6 2006-01-09 08:49:21 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools_NavigationState.st,v 1.7 2006-02-10 17:07:30 cg Exp $'
 ! !