--- a/SimpleView.st	Tue Mar 14 18:22:08 2006 +0100
+++ b/SimpleView.st	Wed Mar 15 11:43:51 2006 +0100
@@ -1463,6 +1463,10 @@
     "Modified: 6.3.1997 / 15:17:31 / cg"
 !
 
+invalidateRectangle:aRectangle repairNow:doRepairNow
+    self invalidate:aRectangle repairNow:doRepairNow
+!
+
 isEnabled
     "return true, if this view is enabled (i.e. accepts user interaction).
      Most views are enabled - only a few (buttons, SelectionInList etc.) can
@@ -1581,7 +1585,12 @@
     masterApp := anApplication perform:#masterApplication ifNotUnderstood:[isApplicationModel := false. nil].
     thisApp := builder application.
     (isApplicationModel and:[anApplication ~~ thisApp]) ifTrue:[
-        masterApp ~~ thisApp ifTrue:[self error:'should not happen'].
+        masterApp ~~ thisApp ifTrue:[
+            self error:'should not happen' mayProceed:true.
+            masterApp isNil ifTrue:[
+                anApplication masterApplication:thisApp.    
+            ].
+        ].
 
         builder application:anApplication.
         savedView := builder window.
@@ -9743,7 +9752,7 @@
 !SimpleView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/SimpleView.st,v 1.545 2006-02-24 12:58:39 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/SimpleView.st,v 1.546 2006-03-15 10:43:51 cg Exp $'
 ! !
 
 SimpleView initialize!