Commit 28ee0ad2 authored by Diederik van Arkel's avatar Diederik van Arkel
Browse files

move GetDialogBackgroundColour and isWindow to UtilIO

parent 72e53eef
...@@ -8,15 +8,10 @@ import EdMouse, EdKeyboard ...@@ -8,15 +8,10 @@ import EdMouse, EdKeyboard
from StrictList import slFromList from StrictList import slFromList
from UtilStrictLists import StrictListToList,:: List(:!),IsEmptyList from UtilStrictLists import StrictListToList,:: List(:!),IsEmptyList
import IDE,IdeState,IdePlatform import IDE,IdeState,UtilIO
//-- //--
isWindow :: !Id *(PSt .l) -> (Bool,*(PSt .l))
isWindow wId ps
# (s,ps) = accPIO getWindowsStack ps
= (isMember wId s, ps)
isConsoleWindow :: !Id !.ConsWinInfo -> Bool isConsoleWindow :: !Id !.ConsWinInfo -> Bool
isConsoleWindow xId {ConsWinInfo | wId} isConsoleWindow xId {ConsWinInfo | wId}
= xId==wId = xId==wId
......
...@@ -4,7 +4,7 @@ import StdTuple, StdEnum, StdList, StdFunc, StdMisc ...@@ -4,7 +4,7 @@ import StdTuple, StdEnum, StdList, StdFunc, StdMisc
import StdMenu, StdWindow, StdId, StdPSt, StdControl import StdMenu, StdWindow, StdId, StdPSt, StdControl
import StdClipboard, StdControlReceiver import StdClipboard, StdControlReceiver
import EdKeyMapping, EdState, EdClient, EdKeyboard import EdKeyMapping, EdState, EdClient, EdKeyboard
import IDE, IdeState, ExtNotice, IdePlatform import IDE, IdeState, ExtNotice, UtilIO
import colorpickcontrol import colorpickcontrol
import ioutil, morecontrols import ioutil, morecontrols
import typewin, colourclip import typewin, colourclip
......
...@@ -12,7 +12,7 @@ from IdeState import :: General, getErrInfo, setErrInfo, :: ErrorInfo, :: MenuId ...@@ -12,7 +12,7 @@ from IdeState import :: General, getErrInfo, setErrInfo, :: ErrorInfo, :: MenuId
from IdeState import :: SearchMenuIds, :: PLMMessage, :: PLMReply, :: MIn, :: EditMenuLS, getInteract, writeLog from IdeState import :: SearchMenuIds, :: PLMMessage, :: PLMReply, :: MIn, :: EditMenuLS, getInteract, writeLog
from EdClient import lineSelection from EdClient import lineSelection
import EdClient import EdClient
import IdePlatform import UtilIO
/* /*
ADD: ADD:
......
...@@ -8,17 +8,12 @@ import EdMouse, EdKeyboard ...@@ -8,17 +8,12 @@ import EdMouse, EdKeyboard
from StrictList import slFromList from StrictList import slFromList
from UtilStrictLists import StrictListToList,:: List(:!),IsEmptyList from UtilStrictLists import StrictListToList,:: List(:!),IsEmptyList
import IDE,IdeState,IdePlatform import IDE,IdeState,UtilIO
import morecontrols, colorpickcontrol, ioutil, colourclip import morecontrols, colorpickcontrol, ioutil, colourclip
import StdClipboard import StdClipboard
//-- //--
isWindow :: !Id *(PSt .l) -> (Bool,*(PSt .l))
isWindow wId ps
# (s,ps) = accPIO getWindowsStack ps
= (isMember wId s, ps)
isTypeWindow :: !Id !.TypeWinInfo -> Bool isTypeWindow :: !Id !.TypeWinInfo -> Bool
isTypeWindow xId {TypeWinInfo | wId} isTypeWindow xId {TypeWinInfo | wId}
= xId==wId = xId==wId
......
definition module UtilIO definition module UtilIO
import StdString, StdFile import StdString, StdFile
import StdPSt, StdMaybe, StdPictureDef import StdPSt, StdMaybe, StdPictureDef, StdId
import UtilDate import UtilDate
LaunchApplication :: !{#Char} !{#Char} !Bool !Files -> ( !Bool, !Files) LaunchApplication :: !{#Char} !{#Char} !Bool !Files -> ( !Bool, !Files)
...@@ -32,3 +32,4 @@ selectDirectory` :: !(PSt .l) -> (!Maybe String,!(PSt .l)) ...@@ -32,3 +32,4 @@ selectDirectory` :: !(PSt .l) -> (!Maybe String,!(PSt .l))
ShellDefault :: !{#Char} !(PSt .l) -> (!Int,!(PSt .l)) ShellDefault :: !{#Char} !(PSt .l) -> (!Int,!(PSt .l))
GetDialogBackgroundColour :: !(PSt .l) -> (!Colour, !PSt .l) GetDialogBackgroundColour :: !(PSt .l) -> (!Colour, !PSt .l)
isWindow :: !Id *(PSt .l) -> (Bool,*(PSt .l))
...@@ -6,7 +6,7 @@ implementation module UtilIO ...@@ -6,7 +6,7 @@ implementation module UtilIO
import StdArray, StdBool, StdClass, StdFile, StdList import StdArray, StdBool, StdClass, StdFile, StdList
import UtilDate import UtilDate
import StdSystem import StdSystem, StdWindow
import code from library "util_io_kernel_lib" import code from library "util_io_kernel_lib"
import code from library "util_io_shell_lib" import code from library "util_io_shell_lib"
...@@ -521,3 +521,8 @@ where ...@@ -521,3 +521,8 @@ where
gcol = (col bitand 0x0000FF00) >> 8 gcol = (col bitand 0x0000FF00) >> 8
bcol = (col bitand 0x00FF0000) >> 16 bcol = (col bitand 0x00FF0000) >> 16
isWindow :: !Id *(PSt .l) -> (Bool,*(PSt .l))
isWindow wId ps
# (s,ps) = accPIO getWindowsStack ps
= (isMember wId s, ps)
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