--- a/WinWorkstation.st	Tue Oct 30 21:00:28 2007 +0100
+++ b/WinWorkstation.st	Tue Oct 30 22:57:42 2007 +0100
@@ -6430,7 +6430,7 @@
 
     |rgb|
 
-%{  
+%{
     int p;
     int __rgb, r, g, b;
 
@@ -6571,9 +6571,9 @@
     rgb isNil ifTrue:[ ^ nil ].
 
     ^ Color
-        redByte:((rgb bitShift:-16) bitAnd:16rFF)
-        greenByte:((rgb bitShift:-8) bitAnd:16rFF)
-        blueByte:(rgb bitAnd:16rFF)
+	redByte:((rgb bitShift:-16) bitAnd:16rFF)
+	greenByte:((rgb bitShift:-8) bitAnd:16rFF)
+	blueByte:(rgb bitAnd:16rFF)
 
     "
      Display getSystemColor:#COLOR_WINDOW
@@ -7442,10 +7442,10 @@
         icon:wicon iconMask:wiconMaskArg
         toolTipMessage:toolTipMessageArg
 
-    |windowId wiconId wiconMask invertedWiconMask wiconMaskId 
+    |windowId wiconId wiconMask invertedWiconMask wiconMaskId
      wiconWidth wiconHeight toolTipMessage|
 
-    "/ the toolTop string cannot be longer than 64 characters including the NULL terminator 
+    "/ the toolTop string cannot be longer than 64 characters including the NULL terminator
     toolTipMessageArg size > 63 ifTrue:[
         toolTipMessage := toolTipMessageArg copyTo:63
     ] ifFalse:[
@@ -7455,7 +7455,7 @@
     windowId := aView id.
 
     wicon notNil ifTrue:[
-        wiconId := wicon id.
+        wiconId := (wicon asFormOn:self) id.
         wiconHeight := wicon height.
         wiconWidth  := wicon width.
         wiconMask := wiconMaskArg.
@@ -7471,9 +7471,9 @@
         ].
     ].
 
-%{  /* STACK: 16000 */
-#ifndef WM_TRAY_MESSAGE 
-# define WM_TRAY_MESSAGE (WM_USER+0x0200)
+%{  /* STACK: 20000 */
+#ifndef WM_TRAY_MESSAGE
+# define WM_TRAY_MESSAGE (WM_USER+0x200)
 #endif
     HBITMAP        xBitMap, maskBitmap;
     HICON          xIcon = (HICON)0;
@@ -7564,9 +7564,9 @@
 
 
         if (hwnd && IsWindow(hwnd)) {
-            nid.hWnd = hwnd; //the hWnd and uID members allow the OS to uniquely identify your icon. 
+            nid.hWnd = hwnd; //the hWnd and uID members allow the OS to uniquely identify your icon.
                              // One window (the hWnd) can have more than one icon, as long as they have unique uIDs.
-            nid.uFlags = 
+            nid.uFlags =
                 NIF_ICON        //we're adding an icon
                 | NIF_MESSAGE   //we want the tray to send a message to the window identified by hWnd when something happens to our icon (see uCallbackMesage member below).
                 | NIF_TIP;      //our icon has a tooltip.
@@ -7581,24 +7581,25 @@
             if (__isString(toolTipMessage)) {
                 strcpy(nid.szTip, __stringVal(toolTipMessage));
             }
-            Shell_NotifyIcon(NIM_ADD, &nid); 
+            Shell_NotifyIcon(NIM_ADD, &nid);
         }
     }
 %}
 
     "
-        |v|
+        |v icon|
 
         v := View new.
         v create.
-        icon := Expecco::ExpeccoIconLibrary expeccoIcon magnifiedTo:16@16.
+        
+        icon := Icon stxIcon.
         Screen current
              createTrayWindowFor:v
              icon:icon iconMask:nil
              toolTipMessage:'Hi There'
     "
 
-    "Modified: / 30-10-2007 / 16:51:35 / cg"
+    "Modified: / 30-10-2007 / 22:57:05 / cg"
 !
 
 createWindowFor:aView type:typeSymbol
@@ -17386,7 +17387,7 @@
 !WinWorkstation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/WinWorkstation.st,v 1.348 2007-10-30 15:54:44 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/WinWorkstation.st,v 1.349 2007-10-30 21:57:42 cg Exp $'
 ! !
 
 WinWorkstation initialize!