From 91a1cb262faecba0fec38462798ba72f7322da7d Mon Sep 17 00:00:00 2001
From: paul <paul@lazarus-ide.org>
Date: Sun, 30 Aug 2009 15:47:25 +0000
Subject: [PATCH] lcl: fix TScrollingWinControl.AutoScroll = False (issue
 #0014279)

git-svn-id: trunk@21485 -
---
 lcl/include/scrollingwincontrol.inc | 31 +++++++++++++++--------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/lcl/include/scrollingwincontrol.inc b/lcl/include/scrollingwincontrol.inc
index 402782a5d3..e88d5e3e42 100644
--- a/lcl/include/scrollingwincontrol.inc
+++ b/lcl/include/scrollingwincontrol.inc
@@ -23,17 +23,8 @@ begin
   begin
     HorzScrollBar.AutoCalcRange;
     VertScrollBar.AutoCalcRange;
-    UpdateScrollBars;
-  end
-  else
-  begin
-    // If AutoScroll is false, then the scrollbars are always invisible
-    if HandleAllocated then
-    begin
-      ShowScrollBar(Handle, SB_HORZ, False);
-      ShowScrollBar(Handle, SB_VERT, False);
-    end;
   end;
+  UpdateScrollBars;
 end;
 
 procedure TScrollingWinControl.CreateWnd;
@@ -196,13 +187,23 @@ begin
 
   if FIsUpdating then Exit;
 
-  if not FAutoScroll then Exit;
-
   FIsUpdating := True;
   try
-    ComputeScrollbars; // page, autorange, visible
-    FVertScrollbar.UpdateScrollbar;
-    FHorzScrollbar.UpdateScrollbar;
+    if AutoScroll then
+    begin
+      ComputeScrollbars; // page, autorange, visible
+      FVertScrollbar.UpdateScrollbar;
+      FHorzScrollbar.UpdateScrollbar;
+    end
+    else
+    begin
+      // If AutoScroll is false, then the scrollbars are always invisible
+      if HandleAllocated then
+      begin
+        ShowScrollBar(Handle, SB_HORZ, False);
+        ShowScrollBar(Handle, SB_VERT, False);
+      end;
+    end;
   finally
     FIsUpdating := False;
   end;