diff -r 0d77637f9d45 -r ab639131be1f ToolApplicationModel.st --- a/ToolApplicationModel.st Mon Aug 24 18:30:56 1998 +0200 +++ b/ToolApplicationModel.st Mon Aug 24 21:51:18 1998 +0200 @@ -310,6 +310,8 @@ desktopIcon "returns the icon used for the desktop" + + ^Icon constantNamed:#'ToolApplicationModel desktopIcon' ifAbsentPut: @@ -319,14 +321,14 @@ desktopIcon magnifiedBy: Display preferredIconSize/desktopIcon extent ] - - - + "Modified: / 24.8.1998 / 21:34:38 / cg" ! menuIcon "returns the icon used for the menu bar" + + ^Icon constantNamed:#'ToolApplicationModel menuIcon' ifAbsentPut: @@ -335,6 +337,8 @@ menuIcon := Icon stxIcon. menuIcon magnifiedBy: MenuPanel defaultFont height/menuIcon height ] + + "Modified: / 24.8.1998 / 21:34:33 / cg" ! ! !ToolApplicationModel class methodsFor:'interface specs'! @@ -737,15 +741,30 @@ getAllImageSelectorsFrom: aClass "returns all image selectors implementing an image spec in class aClass" - |iconClass| + |iconClass imageMethodSelectors r| + + aClass isNil ifTrue:[ + ^ #() + ]. aClass isSymbol ifTrue: [iconClass := Smalltalk at: aClass] ifFalse: [iconClass := aClass]. - ^((iconClass class methodDictionary values select: [:m| m category = 'image specs']) - collect: [:m| m selector]) asSortedCollection asOrderedCollection + imageMethodSelectors := OrderedCollection new. + iconClass withAllSuperclasses do:[:cls | + cls class methodDictionary keysAndValuesDo: [:sel :m | + (r := m resourceType == #image + or:[r == #programImage]) ifTrue:[ + imageMethodSelectors add:sel + ] + ] + ]. + + ^ imageMethodSelectors asSortedCollection asOrderedCollection + + "Modified: / 24.8.1998 / 21:42:34 / cg" ! isVisualStartable @@ -1255,5 +1274,5 @@ !ToolApplicationModel class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libview2/ToolApplicationModel.st,v 1.74 1998-08-21 22:07:34 cg Exp $' + ^ '$Header: /cvs/stx/stx/libview2/ToolApplicationModel.st,v 1.75 1998-08-24 19:51:18 cg Exp $' ! !