Commit 9222b57d authored by Diederik van Arkel's avatar Diederik van Arkel
Browse files

minor integration mods

parent f0fbdce0
...@@ -169,13 +169,6 @@ where ...@@ -169,13 +169,6 @@ where
= ([],world) = ([],world)
# toolbar = [ ProcessToolbar items] # toolbar = [ ProcessToolbar items]
= (toolbar,world) = (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 ini envspath prefspath mEditId mEdUndoId iniClip iniTargets mTargetId eTargetId
mProjectId mPrListId mPrRecId mFhMenId mPhMenId mProjectId mPrListId mPrRecId mFhMenId mPhMenId
[ mFileId [ mFileId
......
...@@ -226,7 +226,8 @@ EmptyABCS = ...@@ -226,7 +226,8 @@ EmptyABCS =
, Nil , Nil
) )
} }
AC_Init :: !ABCCache
AC_Init :: ABCCache
AC_Init = AC_Init =
{ cache = createArray ABCCacheSize EmptyABCS { cache = createArray ABCCacheSize EmptyABCS
, maxi = -1 , maxi = -1
......
...@@ -21,6 +21,8 @@ AbcmodIcon :== 32514 ...@@ -21,6 +21,8 @@ AbcmodIcon :== 32514
DefmodIcon :== 32515 DefmodIcon :== 32515
ImpmodIcon :== 32516 ImpmodIcon :== 32516
toolIconFun :: !Int !(Maybe String) !(IdFun .st) ![(ToolbarItem .st)] !.env -> (![(ToolbarItem .st)],!.env)
AboutBitmap :== 32512 AboutBitmap :== 32512
findBM :== 32513 findBM :== 32513
newfBM :== 32514 newfBM :== 32514
......
...@@ -19,6 +19,15 @@ import code from "cCrossCallMaarten.obj" ...@@ -19,6 +19,15 @@ import code from "cCrossCallMaarten.obj"
import code from library "conkernel_library" import code from library "conkernel_library"
import code from library "bmpgdi_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 :: !*(PSt General) -> *PSt General
PlatformInteractiveInit ps PlatformInteractiveInit ps
// <<< can move this into first_run module // <<< can move this into first_run module
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment