StandardSystemView.st
changeset 1464 e2716325d697
parent 1425 c6963c38dcd8
child 1465 0be7460f58c7
--- a/StandardSystemView.st	Wed Mar 19 15:32:49 1997 +0100
+++ b/StandardSystemView.st	Wed Mar 19 21:58:50 1997 +0100
@@ -327,12 +327,17 @@
      initialize methods."
 
     DefaultIcon isNil ifTrue:[
-	DefaultIcon := Image fromFile:'SmalltalkX.xbm'.
-	DefaultIcon notNil ifTrue:[
-	    DefaultIcon := DefaultIcon on:Display
-	]
+        DefaultIcon := ClassResources at:'ICON'.
+        DefaultIcon isNil ifTrue:[
+            DefaultIcon := Image fromFile:'SmalltalkX.xbm'.
+        ].
+        DefaultIcon notNil ifTrue:[
+            DefaultIcon := DefaultIcon on:Display
+        ]
     ].
     ^ DefaultIcon
+
+    "Modified: 19.3.1997 / 20:31:28 / cg"
 !
 
 defaultLabel
@@ -585,24 +590,6 @@
     ^ icon
 !
 
-iconMask
-    "return the form defined as iconMask.
-     Notice, that many windowManagers ignore this mask
-     (usually, only managers which place icons on the background desktop
-      care for an icon - if at all ...)"
-
-    |mask|
-
-    "/ only images possibly have iconMasks
-    icon notNil ifTrue:[
-	(mask := icon mask) notNil ifTrue:[
-	    ^ self convertedIconMask:mask
-	]
-    ].
-
-    ^ nil
-!
-
 icon:aForm
     "define the form (bitmap) used as icon"
 
@@ -640,6 +627,24 @@
     ]
 !
 
+iconMask
+    "return the form defined as iconMask.
+     Notice, that many windowManagers ignore this mask
+     (usually, only managers which place icons on the background desktop
+      care for an icon - if at all ...)"
+
+    |mask|
+
+    "/ only images possibly have iconMasks
+    icon notNil ifTrue:[
+	(mask := icon mask) notNil ifTrue:[
+	    ^ self convertedIconMask:mask
+	]
+    ].
+
+    ^ nil
+!
+
 iconName:aString
     "this method will vanish soon ... - for backward compatibility"
 
@@ -1299,5 +1304,5 @@
 !StandardSystemView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/StandardSystemView.st,v 1.67 1997-03-05 13:10:22 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/StandardSystemView.st,v 1.68 1997-03-19 20:58:50 cg Exp $'
 ! !