care for masterApp notNil but modal mode.
authorClaus Gittinger <cg@exept.de>
Thu, 18 Feb 1999 18:27:32 +0100
changeset 1105 1985b9e86503
parent 1104 a2f59712ce7b
child 1106 414b7cfe57b1
care for masterApp notNil but modal mode. In this case, do not tell my masterApp about closeRequests.
AppModel.st
ApplicationModel.st
--- a/AppModel.st	Thu Feb 18 13:58:09 1999 +0100
+++ b/AppModel.st	Thu Feb 18 18:27:32 1999 +0100
@@ -1612,7 +1612,11 @@
     "open the window - assumes that the builder has already setup
      the interface."
 
-    builder openDialog.
+"/    builder openDialog.
+    builder
+        openAt:nil 
+        withExtent:nil 
+        andType:#dialog
 
     "Created: 14.2.1997 / 20:20:39 / cg"
 !
@@ -1817,7 +1821,10 @@
 
     |sav|
 
-    masterApplication notNil ifTrue:[
+    "/ In multiView apps, tell my master.
+    "/ (but not if I am a modal reincarnation)
+    (masterApplication notNil 
+    and:[self window isModal not]) ifTrue:[
 
         "/ temporary clear my masterApplication to prevent
         "/ endless recursion, in case the master sends me
@@ -1854,7 +1861,10 @@
 
     |sav|
 
-    masterApplication notNil ifTrue:[
+    "/ In multiView apps, tell my master.
+    "/ (but not if I am a modal reincarnation)
+    (masterApplication notNil 
+    and:[self window isModal not]) ifTrue:[
 
         "/ temporary clear my masterApplication to prevent
         "/ endless recursion, in case the master sends me
@@ -1964,6 +1974,6 @@
 !ApplicationModel class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/Attic/AppModel.st,v 1.99 1999-02-11 11:19:36 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/Attic/AppModel.st,v 1.100 1999-02-18 17:27:32 cg Exp $'
 ! !
 ApplicationModel initialize!
--- a/ApplicationModel.st	Thu Feb 18 13:58:09 1999 +0100
+++ b/ApplicationModel.st	Thu Feb 18 18:27:32 1999 +0100
@@ -1612,7 +1612,11 @@
     "open the window - assumes that the builder has already setup
      the interface."
 
-    builder openDialog.
+"/    builder openDialog.
+    builder
+        openAt:nil 
+        withExtent:nil 
+        andType:#dialog
 
     "Created: 14.2.1997 / 20:20:39 / cg"
 !
@@ -1817,7 +1821,10 @@
 
     |sav|
 
-    masterApplication notNil ifTrue:[
+    "/ In multiView apps, tell my master.
+    "/ (but not if I am a modal reincarnation)
+    (masterApplication notNil 
+    and:[self window isModal not]) ifTrue:[
 
         "/ temporary clear my masterApplication to prevent
         "/ endless recursion, in case the master sends me
@@ -1854,7 +1861,10 @@
 
     |sav|
 
-    masterApplication notNil ifTrue:[
+    "/ In multiView apps, tell my master.
+    "/ (but not if I am a modal reincarnation)
+    (masterApplication notNil 
+    and:[self window isModal not]) ifTrue:[
 
         "/ temporary clear my masterApplication to prevent
         "/ endless recursion, in case the master sends me
@@ -1964,6 +1974,6 @@
 !ApplicationModel class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/ApplicationModel.st,v 1.99 1999-02-11 11:19:36 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/ApplicationModel.st,v 1.100 1999-02-18 17:27:32 cg Exp $'
 ! !
 ApplicationModel initialize!