--- a/Menu.st Tue Mar 03 11:39:42 2015 +0100
+++ b/Menu.st Fri Mar 13 17:20:41 2015 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
"
COPYRIGHT (c) 1997 by eXept Software AG
All Rights Reserved
@@ -11,6 +13,8 @@
"
"{ Package: 'stx:libview2' }"
+"{ NameSpace: Smalltalk }"
+
Model subclass:#Menu
instanceVariableNames:'items groupSizes receiver'
classVariableNames:''
@@ -582,8 +586,7 @@
rcv := aResourceContainerOrApplication.
[rcv notNil and:[resItems isNil]] whileTrue:[
- resItems := anItem resolveSliceMenuItemsIn:rcv
- rememberResourcesIn:aValueHolderOrNil.
+ resItems := anItem resolveSliceMenuItemsIn:rcv rememberResourcesIn:aValueHolderOrNil.
rcv := rcv perform:#masterApplication ifNotUnderstood:nil.
].
@@ -591,10 +594,7 @@
resolvedItems addAll:resItems.
]
] ifFalse:[
- anItem
- findGuiResourcesIn:aResourceContainerOrApplication
- rememberResourcesIn:aValueHolderOrNil.
-
+ anItem findGuiResourcesIn:aResourceContainerOrApplication rememberResourcesIn:aValueHolderOrNil.
resolvedItems add:anItem.
].
].
@@ -1300,6 +1300,6 @@
!Menu class methodsFor:'documentation'!
version_CVS
- ^ '$Header: /cvs/stx/stx/libview2/Menu.st,v 1.93 2014-07-08 14:38:32 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview2/Menu.st,v 1.94 2015-03-13 16:20:41 cg Exp $'
! !