From 054b715d8df69543e870f5ed6435f31a126e07df Mon Sep 17 00:00:00 2001
From: lazarus <lazarus@lazarus-ide.org>
Date: Thu, 5 Sep 2002 10:12:07 +0000
Subject: [PATCH] New dialog for multiline caption of TCustomLabel. Prettified
 TStrings property editor. Memo now has automatic scrollbars (not fully
 working), WordWrap and Scrollbars property Removed saving of old combo text
 (it broke things and is not needed). Cleanups.

git-svn-id: trunk@3283 -
---
 lcl/include/treeview.inc |  2 +-
 lcl/stdctrls.pp          | 19 +++++++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/lcl/include/treeview.inc b/lcl/include/treeview.inc
index 3c0ab3b2f5..e50cc32937 100644
--- a/lcl/include/treeview.inc
+++ b/lcl/include/treeview.inc
@@ -2382,7 +2382,7 @@ procedure TCustomTreeView.CreateParams(var Params: TCreateParams);
   RowSelectStyles: array[Boolean] of DWORD = (0, TVS_FULLROWSELECT);}
 const
   ScrollBar: array[TScrollStyle] of DWORD = (0, WS_HSCROLL, WS_VSCROLL,
-                                             WS_HSCROLL or WS_VSCROLL);
+    WS_HSCROLL or WS_VSCROLL, WS_HSCROLL, WS_VSCROLL, WS_HSCROLL or WS_VSCROLL);
   BorderStyles: array[TBorderStyle] of DWORD = (0, WS_BORDER);
   ClassStylesOff = CS_VREDRAW or CS_HREDRAW;
 begin
diff --git a/lcl/stdctrls.pp b/lcl/stdctrls.pp
index 36308513f1..0de7f81ffe 100644
--- a/lcl/stdctrls.pp
+++ b/lcl/stdctrls.pp
@@ -46,7 +46,8 @@ type
   { TScrollBar }
 
   TEditCharCase = (ecNormal, ecUppercase, ecLowerCase);
-  TScrollStyle = (ssNone, ssHorizontal, ssVertical, ssBoth);
+  TScrollStyle = (ssNone, ssHorizontal, ssVertical, ssBoth,
+    ssAutoHorizontal, ssAutoVertical, ssAutoBoth);
 
   TScrollCode = (scLineUp, scLineDown, scPageUp, scPageDown, scPosition,
                  scTrack, scTop, scBottom, scEndScroll);
@@ -377,13 +378,14 @@ type
     FWordWrap: Boolean;
   protected
     procedure SetLines(Value : TStrings);
-    procedure SetWordWrap(Value : Boolean);
+    procedure SetWordWrap(const Value : boolean);
+    procedure SetScrollBars(const Value : TScrollStyle);
   public
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
-    procedure Append(Value : String);
+    procedure Append(const Value : String);
     property Lines: TStrings read FLines write SetLines;
-    property ScrollBars: TScrollStyle read FScrollBars write FScrollBars;
+    property ScrollBars: TScrollStyle read FScrollBars write SetScrollBars;
     property WordWrap: Boolean read FWordWrap write SetWordWrap;
     property Font : TFont read FFont write FFont;
   end;
@@ -411,8 +413,10 @@ type
     property Lines;
     property PopupMenu;
     property ReadOnly;
+    property ScrollBars;
     property Tabstop;
     property Visible;
+    property WordWrap;
     property OnChange;
   end;
 
@@ -721,7 +725,14 @@ end.
 { =============================================================================
 
   $Log$
+  Revision 1.41  2002/09/05 10:12:06  lazarus
+  New dialog for multiline caption of TCustomLabel.
+  Prettified TStrings property editor.
+  Memo now has automatic scrollbars (not fully working), WordWrap and Scrollbars property
+  Removed saving of old combo text (it broke things and is not needed). Cleanups.
+
   Revision 1.40  2002/09/03 11:32:49  lazarus
+
   Added shortcut keys to labels
   Support for alphabetically sorting the properties
   Standardize message and add shortcuts ala Kylix