SynEdit: remove old IFDEF

git-svn-id: trunk@58525 -
This commit is contained in:
martin 2018-07-15 00:24:28 +00:00
parent 5e5ba12237
commit eeba3dff66

View File

@ -4820,19 +4820,16 @@ begin
ShowScrollBar(Handle, SB_Horz, sfHorizScrollbarVisible in fStateFlags); ShowScrollBar(Handle, SB_Horz, sfHorizScrollbarVisible in fStateFlags);
RecalcCharsAndLinesInWin(True); RecalcCharsAndLinesInWin(True);
end; end;
{$IFnDEF SynNewScrollBarUpdate}
if (sfHorizScrollbarVisible in fStateFlags) then begin if (sfHorizScrollbarVisible in fStateFlags) then begin
{$ENDIF} debugln(['}}} ',ScrollInfo.nMax, ', ',CharsInWindow ]);
ScrollInfo.nPage := CharsInWindow; ScrollInfo.nPage := CharsInWindow;
ScrollInfo.nPos := LeftChar; ScrollInfo.nPos := LeftChar;
SetScrollInfo(Handle, SB_HORZ, ScrollInfo, True); SetScrollInfo(Handle, SB_HORZ, ScrollInfo, True);
{$IFNDEF LCLWin32} {$IFnDEF SynScrollBarWorkaround} {$IFNDEF LCLWin32} {$IFnDEF SynScrollBarWorkaround}
if not (sfHorizScrollbarVisible in fStateFlags) then if not (sfHorizScrollbarVisible in fStateFlags) then
ShowScrollBar(Handle, SB_Horz, False); ShowScrollBar(Handle, SB_Horz, False);
{$ENDIF} {$ENDIF} {$ENDIF} {$ENDIF}
{$IFnDEF SynNewScrollBarUpdate}
end; end;
{$ENDIF}
//DebugLn('[TCustomSynEdit.UpdateScrollbars] nMin=',ScrollInfo.nMin,' nMax=',ScrollInfo.nMax, //DebugLn('[TCustomSynEdit.UpdateScrollbars] nMin=',ScrollInfo.nMin,' nMax=',ScrollInfo.nMax,
//' nPage=',ScrollInfo.nPage,' nPos=',ScrollInfo.nPos,' ClientW=',ClientWidth); //' nPage=',ScrollInfo.nPage,' nPos=',ScrollInfo.nPos,' ClientW=',ClientWidth);
@ -4852,19 +4849,15 @@ begin
ShowScrollBar(Handle, SB_Vert, sfVertScrollbarVisible in fStateFlags); ShowScrollBar(Handle, SB_Vert, sfVertScrollbarVisible in fStateFlags);
RecalcCharsAndLinesInWin(True); RecalcCharsAndLinesInWin(True);
end; end;
{$IFnDEF SynNewScrollBarUpdate} if (sfVertScrollbarVisible in fStateFlags) then begin
if (sfVertScrollbarVisible in fStateFlags) then begin ScrollInfo.nPage := LinesInWindow;
{$ENDIF} ScrollInfo.nPos := TopView;
ScrollInfo.nPage := LinesInWindow; SetScrollInfo(Handle, SB_VERT, ScrollInfo, True);
ScrollInfo.nPos := TopView; {$IFNDEF LCLWin32} {$IFnDEF SynScrollBarWorkaround}
SetScrollInfo(Handle, SB_VERT, ScrollInfo, True); if not (sfVertScrollbarVisible in fStateFlags) then
{$IFNDEF LCLWin32} {$IFnDEF SynScrollBarWorkaround} ShowScrollBar(Handle, SB_Vert, False);
if not (sfVertScrollbarVisible in fStateFlags) then {$ENDIF} {$ENDIF}
ShowScrollBar(Handle, SB_Vert, False);
{$ENDIF} {$ENDIF}
{$IFnDEF SynNewScrollBarUpdate}
end; end;
{$ENDIF}
end; end;
end; end;