diff --git a/Libraries/ObjectIO/ObjectIO/StdWindow.icl b/Libraries/ObjectIO/ObjectIO/StdWindow.icl index cb59073cfb51374d05beb67892fde5c3a4f23be5..5a8e8ad00e5e05b1871098f8317920dbb0d0262c 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"