Commit 3dbd4d52 authored by John van Groningen's avatar John van Groningen

remove use of function accMaybe (accMaybe will be removed from module StdMaybe)

parent 22c4bd68
...@@ -1455,9 +1455,9 @@ where ...@@ -1455,9 +1455,9 @@ where
getwindowscrollfunction :: !Direction !(WindowStateHandle .pst) -> *(!Maybe ScrollFunction,!WindowStateHandle .pst) getwindowscrollfunction :: !Direction !(WindowStateHandle .pst) -> *(!Maybe ScrollFunction,!WindowStateHandle .pst)
getwindowscrollfunction direction wsH=:{wshHandle=Just {wlsHandle=wH=:{whWindowInfo}}} getwindowscrollfunction direction wsH=:{wshHandle=Just {wlsHandle=wH=:{whWindowInfo}}}
| direction==Horizontal && isJust hScroll | direction==Horizontal && isJust hScroll
= (fst (accMaybe getScrollFun hScroll),wsH) = (mapMaybe getScrollFun hScroll,wsH)
| direction==Vertical && isJust vScroll | direction==Vertical && isJust vScroll
= (fst (accMaybe getScrollFun vScroll),wsH) = (mapMaybe getScrollFun vScroll,wsH)
| otherwise | otherwise
= (Nothing,wsH) = (Nothing,wsH)
where where
...@@ -1465,9 +1465,9 @@ where ...@@ -1465,9 +1465,9 @@ where
hScroll = windowInfo.windowHScroll hScroll = windowInfo.windowHScroll
vScroll = windowInfo.windowVScroll vScroll = windowInfo.windowVScroll
getScrollFun :: !ScrollInfo -> *(!ScrollFunction,!ScrollInfo) getScrollFun :: !ScrollInfo -> ScrollFunction
getScrollFun info=:{scrollFunction} getScrollFun info=:{scrollFunction}
= (scrollFunction,info) = scrollFunction
getwindowscrollfunction _ _ getwindowscrollfunction _ _
= stdWindowFatalError "getWindowScrollFunction" "unexpected window placeholder argument" = stdWindowFatalError "getWindowScrollFunction" "unexpected window placeholder argument"
......
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