From 3dbd4d5209c65708d7e16d81b3ca2db03402c91c Mon Sep 17 00:00:00 2001 From: John van Groningen Date: Wed, 15 Aug 2018 09:49:17 +0000 Subject: [PATCH] remove use of function accMaybe (accMaybe will be removed from module StdMaybe) --- Libraries/ObjectIO/ObjectIO/StdWindow.icl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Libraries/ObjectIO/ObjectIO/StdWindow.icl b/Libraries/ObjectIO/ObjectIO/StdWindow.icl index cb59073c..5a8e8ad0 100644 --- a/Libraries/ObjectIO/ObjectIO/StdWindow.icl +++ b/Libraries/ObjectIO/ObjectIO/StdWindow.icl @@ -1455,9 +1455,9 @@ where getwindowscrollfunction :: !Direction !(WindowStateHandle .pst) -> *(!Maybe ScrollFunction,!WindowStateHandle .pst) getwindowscrollfunction direction wsH=:{wshHandle=Just {wlsHandle=wH=:{whWindowInfo}}} | direction==Horizontal && isJust hScroll - = (fst (accMaybe getScrollFun hScroll),wsH) + = (mapMaybe getScrollFun hScroll,wsH) | direction==Vertical && isJust vScroll - = (fst (accMaybe getScrollFun vScroll),wsH) + = (mapMaybe getScrollFun vScroll,wsH) | otherwise = (Nothing,wsH) where @@ -1465,9 +1465,9 @@ where hScroll = windowInfo.windowHScroll vScroll = windowInfo.windowVScroll - getScrollFun :: !ScrollInfo -> *(!ScrollFunction,!ScrollInfo) + getScrollFun :: !ScrollInfo -> ScrollFunction getScrollFun info=:{scrollFunction} - = (scrollFunction,info) + = scrollFunction getwindowscrollfunction _ _ = stdWindowFatalError "getWindowScrollFunction" "unexpected window placeholder argument" -- GitLab