minor integration mods

Ide/IDE.icl

@@ -169,13 +169,6 @@ where
 			= ([],world)
 		# toolbar			=	[ ProcessToolbar items]
 		= (toolbar,world)
-	toolIconFun toolname tooltip toolfun itemlist world
-//		# (bmp,world)	= openBitmap (applicationpath toolname) world
-		# (bmp,world)	= GetBitmapResource toolname world
-		# itemlist		= case bmp of
-							Nothing		-> abort ("Loading failed: "+++toString toolname)
-							Just bmp	-> [ToolbarItem bmp tooltip toolfun:itemlist]
-		= (itemlist,world)
 	ini envspath prefspath mEditId mEdUndoId iniClip iniTargets mTargetId eTargetId
 		mProjectId mPrListId mPrRecId mFhMenId mPhMenId
 		[ mFileId

Pm/PmAbcMagic.icl

@@ -226,7 +226,8 @@ EmptyABCS =
 	, Nil
 	)
 	}
-AC_Init :: !ABCCache
+
+AC_Init :: ABCCache
 AC_Init =
 	{ cache = createArray ABCCacheSize EmptyABCS
 	, maxi	= -1

Win/IdePlatform.dcl

@@ -21,6 +21,8 @@ AbcmodIcon	:== 32514
 DefmodIcon	:== 32515
 ImpmodIcon	:== 32516
 
+toolIconFun :: !Int !(Maybe String) !(IdFun .st) ![(ToolbarItem .st)] !.env -> (![(ToolbarItem .st)],!.env)
+
 AboutBitmap	:== 32512
 findBM		:== 32513
 newfBM		:== 32514

Win/IdePlatform.icl

@@ -19,6 +19,15 @@ import code from "cCrossCallMaarten.obj"
 import code from library "conkernel_library"
 import code from library "bmpgdi_library"
 
+toolIconFun :: !Int !(Maybe String) !(IdFun .st) ![(ToolbarItem .st)] !.env -> (![(ToolbarItem .st)],!.env)
+toolIconFun toolname tooltip toolfun itemlist world
+//		# (bmp,world)	= openBitmap (applicationpath toolname) world
+	# (bmp,world)	= GetBitmapResource toolname world
+	# itemlist		= case bmp of
+						Nothing		-> abort ("Loading failed: "+++toString toolname)
+						Just bmp	-> [ToolbarItem bmp tooltip toolfun:itemlist]
+	= (itemlist,world)
+
 PlatformInteractiveInit		:: !*(PSt General)	-> *PSt General
 PlatformInteractiveInit ps
 	// <<< can move this into first_run module