Commit e559503b authored by Diederik van Arkel's avatar Diederik van Arkel

Mac updates

parent f49ab2a5
definition module IdePlatform definition module IdePlatform
import StdPSt, StdString import StdPSt, StdString, StdFile
import StdIOCommon import StdIOCommon
from IdeState import :: General from IdeState import :: General
...@@ -20,7 +20,8 @@ AbcmodIcon :== 32514 ...@@ -20,7 +20,8 @@ AbcmodIcon :== 32514
toolIconFun :: !String !(Maybe String) !(IdFun .st) ![(ToolbarItem .st)] !*env -> (![(ToolbarItem .st)],!*env) | FileSystem env toolIconFun :: !String !(Maybe String) !(IdFun .st) ![(ToolbarItem .st)] !*env -> (![(ToolbarItem .st)],!*env) | FileSystem env
AboutBitmap :== "" getAboutBitmap :: !*env -> (!Maybe Bitmap, !*env) | FileEnv env
findBM :== "findBM.bmp" findBM :== "findBM.bmp"
newfBM :== "newfBM.bmp" newfBM :== "newfBM.bmp"
openBM :== "openBM.bmp" openBM :== "openBM.bmp"
......
...@@ -2,7 +2,7 @@ implementation module IdePlatform ...@@ -2,7 +2,7 @@ implementation module IdePlatform
import StdPSt import StdPSt
import StdArray, StdEnum, StdList import StdArray, StdEnum, StdList
import StdFunc import StdFunc, StdSystem
import PmCleanSystem import PmCleanSystem
import errwin import errwin
from IdeState import :: General from IdeState import :: General
...@@ -51,7 +51,12 @@ DefmodIcon :== 32515 ...@@ -51,7 +51,12 @@ DefmodIcon :== 32515
CleanIcon :== 32512 CleanIcon :== 32512
AbcmodIcon :== 32514 AbcmodIcon :== 32514
AboutBitmap :== "" getAboutBitmap :: !*env -> (!Maybe Bitmap, !*env) | FileEnv env
getAboutBitmap env
= accFiles (openBitmap AboutBitmap) env
AboutBitmap :== applicationpath "bitmaps:aboutIDE.pict"
findBM :== "findBM.bmp" findBM :== "findBM.bmp"
newfBM :== "newfBM.bmp" newfBM :== "newfBM.bmp"
openBM :== "openBM.bmp" openBM :== "openBM.bmp"
......
...@@ -9,7 +9,7 @@ initPlatformCommandLine :: !*(PSt .l) -> (![String],!*PSt .l) ...@@ -9,7 +9,7 @@ initPlatformCommandLine :: !*(PSt .l) -> (![String],!*PSt .l)
installPlatformEventHandlers :: !*(PSt .l) -> *(PSt .l) installPlatformEventHandlers :: !*(PSt .l) -> *(PSt .l)
openPlatformWindowMenu :: !*(PSt .l) -> *(PSt .l) openPlatformWindowMenu :: !*(PSt .l) -> *(PSt .l)
TooltempDir :: String TempDir :: String
EnvsDir :: String EnvsDir :: String
PrefsDir :: String PrefsDir :: String
BitmapDir :: String BitmapDir :: String
......
...@@ -45,8 +45,8 @@ install_apple_event_handlers ...@@ -45,8 +45,8 @@ install_apple_event_handlers
call .install_apple_event_handlers call .install_apple_event_handlers
} }
TooltempDir :: String TempDir :: String
TooltempDir = applicationpath "Temp" TempDir = applicationpath "Temp"
EnvsDir :: String EnvsDir :: String
EnvsDir = applicationpath "Config" EnvsDir = applicationpath "Config"
......
...@@ -497,8 +497,8 @@ Link linker` winfun path ...@@ -497,8 +497,8 @@ Link linker` winfun path
, dynamics_path = "" , dynamics_path = ""
} }
# linkerpath = RemoveFilename linker # linkerpath = RemoveFilename linker
# linkoptspath = MakeFullPathname TooltempDir "linkopts" # linkoptspath = MakeFullPathname TempDir "linkopts"
# linkerrspath = MakeFullPathname TooltempDir "linkerrs" # linkerrspath = MakeFullPathname TempDir "linkerrs"
# (err,ps) = accFiles (WriteLinkOpts linkoptspath linkopts) ps # (err,ps) = accFiles (WriteLinkOpts linkoptspath linkopts) ps
| isJust err | isJust err
= (winfun (fromJust err) ps,False) = (winfun (fromJust err) ps,False)
......
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