fixed #windowGroup - if there is a masterApp
authorClaus Gittinger <cg@exept.de>
Fri, 21 Aug 1998 21:01:42 +0200
changeset 1050 c062ec647d98
parent 1049 1afeefeedd14
child 1051 65dfbf6481b5
fixed #windowGroup - if there is a masterApp (how can this happen to be nil in a subApp ?)
AppModel.st
ApplicationModel.st
--- a/AppModel.st	Thu Aug 20 00:40:06 1998 +0200
+++ b/AppModel.st	Fri Aug 21 21:01:42 1998 +0200
@@ -667,7 +667,12 @@
     (w := builder window) notNil ifTrue:[
         ^ w windowGroup
     ].
+    masterApplication notNil ifTrue:[
+        ^ masterApplication windowGroup
+    ].
     ^ nil
+
+    "Modified: / 21.8.1998 / 15:59:07 / cg"
 ! !
 
 !ApplicationModel methodsFor:'binding access'!
@@ -1092,7 +1097,9 @@
 
     |wg mySensor|
 
-    self showingHelp ifFalse: [^true].
+    self showingHelp ifFalse: [
+        ^ true
+    ].
 
 "/    masterApplication notNil ifTrue:[
 "/        (masterApplication showActiveHelp:aHelpText for:view) ifTrue:[
@@ -1112,12 +1119,15 @@
             mySensor 
                 pushUserEvent:#showHelp:for: for:self 
                 withArguments:(Array with:aHelpText with:view).
-        ].
+            ^ true
+        ]
     ].
 
-    ^true
+    "/ mhmh - can this happen ?
 
-    "Modified: / 31.7.1998 / 18:35:05 / cg"
+    ^ true
+
+    "Modified: / 21.8.1998 / 16:00:37 / cg"
 !
 
 showHelp:aHelpText for:view
@@ -1915,6 +1925,6 @@
 !ApplicationModel class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/Attic/AppModel.st,v 1.94 1998-08-02 20:21:56 tz Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/Attic/AppModel.st,v 1.95 1998-08-21 19:01:42 cg Exp $'
 ! !
 ApplicationModel initialize!
--- a/ApplicationModel.st	Thu Aug 20 00:40:06 1998 +0200
+++ b/ApplicationModel.st	Fri Aug 21 21:01:42 1998 +0200
@@ -667,7 +667,12 @@
     (w := builder window) notNil ifTrue:[
         ^ w windowGroup
     ].
+    masterApplication notNil ifTrue:[
+        ^ masterApplication windowGroup
+    ].
     ^ nil
+
+    "Modified: / 21.8.1998 / 15:59:07 / cg"
 ! !
 
 !ApplicationModel methodsFor:'binding access'!
@@ -1092,7 +1097,9 @@
 
     |wg mySensor|
 
-    self showingHelp ifFalse: [^true].
+    self showingHelp ifFalse: [
+        ^ true
+    ].
 
 "/    masterApplication notNil ifTrue:[
 "/        (masterApplication showActiveHelp:aHelpText for:view) ifTrue:[
@@ -1112,12 +1119,15 @@
             mySensor 
                 pushUserEvent:#showHelp:for: for:self 
                 withArguments:(Array with:aHelpText with:view).
-        ].
+            ^ true
+        ]
     ].
 
-    ^true
+    "/ mhmh - can this happen ?
 
-    "Modified: / 31.7.1998 / 18:35:05 / cg"
+    ^ true
+
+    "Modified: / 21.8.1998 / 16:00:37 / cg"
 !
 
 showHelp:aHelpText for:view
@@ -1915,6 +1925,6 @@
 !ApplicationModel class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/ApplicationModel.st,v 1.94 1998-08-02 20:21:56 tz Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/ApplicationModel.st,v 1.95 1998-08-21 19:01:42 cg Exp $'
 ! !
 ApplicationModel initialize!