From 2dd3a2c7b1cdebbcd4937e1e8694aa12c35993f9 Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Wed, 30 Jul 2003 13:03:44 +0000
Subject: [PATCH] replaced label with memo

git-svn-id: trunk@4436 -
---
 designer/objectinspector.pp |  3 ---
 ide/debugoptionsfrm.pas     | 15 ++++++++-------
 lcl/controls.pp             |  9 +++++++--
 lcl/include/wincontrol.inc  | 15 +++++++++++++++
 lcl/stdctrls.pp             |  6 ++++--
 5 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/designer/objectinspector.pp b/designer/objectinspector.pp
index db41a871b6..e4663fbdf3 100644
--- a/designer/objectinspector.pp
+++ b/designer/objectinspector.pp
@@ -2168,7 +2168,6 @@ begin
     PageIndex:=0;
     PopupMenu:=MainPopupMenu;
     Align:= alClient;
-    Visible:=true;
   end;
 
   // property grid
@@ -2188,7 +2187,6 @@ begin
     Align:=alClient;
     PopupMenu:=MainPopupMenu;
     OnModified:=@OnGridModified;
-    Visible:=true;
   end;
 
   // event grid
@@ -2204,7 +2202,6 @@ begin
     Align:=alClient;
     PopupMenu:=MainPopupMenu;
     OnModified:=@OnGridModified;
-    Visible:=true;
   end;
 
 end;
diff --git a/ide/debugoptionsfrm.pas b/ide/debugoptionsfrm.pas
index ab5663a1ae..c93d4b6afe 100644
--- a/ide/debugoptionsfrm.pas
+++ b/ide/debugoptionsfrm.pas
@@ -141,11 +141,11 @@ procedure TDebuggerOptionsForm.FetchDebuggerSpecificOptions;
 var
   NewDebuggerType: TDebuggerType;
   i: Integer;
-  ALabel: TLabel;
+  AMemo: TMemo;
 begin
   NewDebuggerType:=DebuggerNameToType(cmbDebuggerType.Text);
   if NewDebuggerType=FCurDebuggerType then exit;
-
+  
   // clear debugger specific options components
   if FDebuggerSpecificComponents=nil then
     FDebuggerSpecificComponents:=TList.Create;
@@ -165,13 +165,14 @@ begin
   
   dtSSHGNUDebugger:
     begin
-      ALabel:=TLabel.Create(Self);
-      FDebuggerSpecificComponents.Add(ALabel);
-      with ALabel do begin
-        Name:='DebOptsSpecLabel1';
+      AMemo:=TMemo.Create(Self);
+      FDebuggerSpecificComponents.Add(AMemo);
+      with AMemo do begin
+        Name:='DebOptsSpecMemo1';
         Parent:=gbDebuggerSpecific;
-        SetBounds(10,10,Parent.Width-25,Parent.Height-30);
+        SetBounds(5,5,Parent.Width-15,Parent.Height-35);
         WordWrap:=true;
+        ReadOnly:=true;
         Caption:='The GNU debugger through ssh allows to remote debug via a ssh'
           +' connection. See docs/RemoteDebugging.txt for details. The path'
           +' must contain the ssh client filename, the hostname with an optional'
diff --git a/lcl/controls.pp b/lcl/controls.pp
index 3ec0e38b76..b1749f5d8b 100644
--- a/lcl/controls.pp
+++ b/lcl/controls.pp
@@ -811,8 +811,8 @@ type
     procedure SetInitialBounds(aLeft, aTop, aWidth, aHeight : integer); virtual;
     procedure SetBoundsKeepBase(aLeft, aTop, aWidth, aHeight : integer;
                                 Lock: boolean); virtual;
-    function  GetTextBuf(Buffer: PChar; BufSize: Integer): Integer;
-    Procedure SetTextBuf(Buffer : PChar);
+    function  GetTextBuf(Buffer: PChar; BufSize: Integer): Integer; virtual;
+    Procedure SetTextBuf(Buffer : PChar); virtual;
     Function  Perform(Msg:Cardinal; WParam , LParam : LongInt): LongInt;
     Function  ScreenToClient(const Point : TPoint) : TPoint;
     Function  ClientToScreen(const Point : TPoint) : TPoint;
@@ -1092,6 +1092,8 @@ type
     Procedure GetTabOrderList(List : TList);
     function HandleAllocated : Boolean;
     procedure HandleNeeded;
+    function  GetTextBuf(Buffer: PChar; BufSize: Integer): Integer; override;
+    Procedure SetTextBuf(Buffer : PChar); override;
   public
     property BoundsLockCount: integer read FBoundsLockCount;
     property Brush: TBrush read FBrush;
@@ -1630,6 +1632,9 @@ end.
 { =============================================================================
 
   $Log$
+  Revision 1.138  2003/07/30 13:03:44  mattias
+  replaced label with memo
+
   Revision 1.137  2003/07/24 06:54:32  mattias
   fixed anti circle mechnism for aligned controls
 
diff --git a/lcl/include/wincontrol.inc b/lcl/include/wincontrol.inc
index ab86bf6ae3..b8c15a36ed 100644
--- a/lcl/include/wincontrol.inc
+++ b/lcl/include/wincontrol.inc
@@ -2701,6 +2701,18 @@ begin
   end;
 end;
 
+function TWinControl.GetTextBuf(Buffer: PChar; BufSize: Integer): Integer;
+begin
+  Result:=inherited GetTextBuf(Buffer, BufSize);
+end;
+
+procedure TWinControl.SetTextBuf(Buffer: PChar);
+begin
+  if not HandleAllocated then exit;
+  CNSendMessage(LM_SetLabel, Self, Buffer);
+  inherited SetTextBuf(Buffer);
+end;
+
 {------------------------------------------------------------------------------
   Method: TControl.BeginUpdateBounds
   Params:  None
@@ -2934,6 +2946,9 @@ end;
 { =============================================================================
 
   $Log$
+  Revision 1.156  2003/07/30 13:03:44  mattias
+  replaced label with memo
+
   Revision 1.155  2003/07/25 08:00:36  mattias
   fixed sending follow up move/size messages from gtk
 
diff --git a/lcl/stdctrls.pp b/lcl/stdctrls.pp
index cd8de60569..9efaa986c0 100644
--- a/lcl/stdctrls.pp
+++ b/lcl/stdctrls.pp
@@ -248,8 +248,7 @@ type
     procedure SetStyle(Val : TComboBoxStyle); virtual;
     procedure KeyDown(var Key : Word; Shift : TShiftState); override;
 
-    property DropDownCount: Integer read
-      FDropDownCount write SetDropDownCount default 8;
+    property DropDownCount: Integer read FDropDownCount write SetDropDownCount default 8;
     property Items: TStrings read FItems write SetItems;
     property ItemHeight: Integer read GetItemHeight write SetItemHeight;
     property ItemIndex: integer read GetItemIndex write SetItemIndex;
@@ -1465,6 +1464,9 @@ end.
 { =============================================================================
 
   $Log$
+  Revision 1.101  2003/07/30 13:03:44  mattias
+  replaced label with memo
+
   Revision 1.100  2003/07/07 23:58:43  marc
   + Implemented TCheckListBox.Checked[] property