From eeba3dff66bd6c539522e10198b34171bfa19c21 Mon Sep 17 00:00:00 2001 From: martin Date: Sun, 15 Jul 2018 00:24:28 +0000 Subject: [PATCH] SynEdit: remove old IFDEF git-svn-id: trunk@58525 - --- components/synedit/synedit.pp | 39 ++++++++++++++--------------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/components/synedit/synedit.pp b/components/synedit/synedit.pp index ef2284ac33..c9cd034214 100644 --- a/components/synedit/synedit.pp +++ b/components/synedit/synedit.pp @@ -4820,19 +4820,16 @@ begin ShowScrollBar(Handle, SB_Horz, sfHorizScrollbarVisible in fStateFlags); RecalcCharsAndLinesInWin(True); end; - {$IFnDEF SynNewScrollBarUpdate} if (sfHorizScrollbarVisible in fStateFlags) then begin - {$ENDIF} - ScrollInfo.nPage := CharsInWindow; - ScrollInfo.nPos := LeftChar; - SetScrollInfo(Handle, SB_HORZ, ScrollInfo, True); - {$IFNDEF LCLWin32} {$IFnDEF SynScrollBarWorkaround} - if not (sfHorizScrollbarVisible in fStateFlags) then - ShowScrollBar(Handle, SB_Horz, False); - {$ENDIF} {$ENDIF} - {$IFnDEF SynNewScrollBarUpdate} +debugln(['}}} ',ScrollInfo.nMax, ', ',CharsInWindow ]); + ScrollInfo.nPage := CharsInWindow; + ScrollInfo.nPos := LeftChar; + SetScrollInfo(Handle, SB_HORZ, ScrollInfo, True); + {$IFNDEF LCLWin32} {$IFnDEF SynScrollBarWorkaround} + if not (sfHorizScrollbarVisible in fStateFlags) then + ShowScrollBar(Handle, SB_Horz, False); + {$ENDIF} {$ENDIF} end; - {$ENDIF} //DebugLn('[TCustomSynEdit.UpdateScrollbars] nMin=',ScrollInfo.nMin,' nMax=',ScrollInfo.nMax, //' nPage=',ScrollInfo.nPage,' nPos=',ScrollInfo.nPos,' ClientW=',ClientWidth); @@ -4852,19 +4849,15 @@ begin ShowScrollBar(Handle, SB_Vert, sfVertScrollbarVisible in fStateFlags); RecalcCharsAndLinesInWin(True); end; - {$IFnDEF SynNewScrollBarUpdate} - if (sfVertScrollbarVisible in fStateFlags) then begin - {$ENDIF} - ScrollInfo.nPage := LinesInWindow; - ScrollInfo.nPos := TopView; - SetScrollInfo(Handle, SB_VERT, ScrollInfo, True); - {$IFNDEF LCLWin32} {$IFnDEF SynScrollBarWorkaround} - if not (sfVertScrollbarVisible in fStateFlags) then - ShowScrollBar(Handle, SB_Vert, False); - {$ENDIF} {$ENDIF} - {$IFnDEF SynNewScrollBarUpdate} + if (sfVertScrollbarVisible in fStateFlags) then begin + ScrollInfo.nPage := LinesInWindow; + ScrollInfo.nPos := TopView; + SetScrollInfo(Handle, SB_VERT, ScrollInfo, True); + {$IFNDEF LCLWin32} {$IFnDEF SynScrollBarWorkaround} + if not (sfVertScrollbarVisible in fStateFlags) then + ShowScrollBar(Handle, SB_Vert, False); + {$ENDIF} {$ENDIF} end; - {$ENDIF} end; end;