Changeset 412 for branches/highdpi/Packages/DpiControls/UDpiControls.pas

Timestamp:

Nov 4, 2021, 2:59:11 PM (3 years ago)

Author:

chronos

Message:

• Modified: Merged changes from trunk r411.

File:

• branches/highdpi/Packages/DpiControls/UDpiControls.pas (modified) (2 diffs)

branches/highdpi/Packages/DpiControls/UDpiControls.pas

@@ -981 +981 @@
     NativeMemo: TMemo;
     function GetLines: TStrings;
+    function GetReadOnly: Boolean;
+    function GetScrollBars: TScrollStyle;
+    function GetWordWrap: Boolean;
     procedure SetLines(AValue: TStrings);
+    procedure SetReadOnly(AValue: Boolean);
+    procedure SetScrollBars(AValue: TScrollStyle);
+    procedure SetWordWrap(AValue: Boolean);
+  protected
+    function GetNativeWinControl: TWinControl; override;
+    function GetNativeMemo: TMemo; virtual;
   public
     procedure Clear;
-    function GetNativeMemo: TMemo;
     constructor Create(TheOwner: TComponent); override;
     destructor Destroy; override;
+  published
     property Lines: TStrings read GetLines write SetLines;
+    property WordWrap: Boolean read GetWordWrap write SetWordWrap default True;
+    property ReadOnly: Boolean read GetReadOnly write SetReadOnly default False;
+    property ScrollBars: TScrollStyle read GetScrollBars write SetScrollBars default ssNone;
   end;
 
@@ -1658 +1670 @@
 end;
 
+function TDpiMemo.GetReadOnly: Boolean;
+begin
+  Result := GetNativeMemo.ReadOnly;
+end;
+
+function TDpiMemo.GetScrollBars: TScrollStyle;
+begin
+  Result := GetNativeMemo.ScrollBars;
+end;
+
+function TDpiMemo.GetWordWrap: Boolean;
+begin
+  Result := GetNativeMemo.WordWrap;
+end;
+
 procedure TDpiMemo.SetLines(AValue: TStrings);
 begin
   GetNativeMemo.Lines := AValue;
+end;
+
+procedure TDpiMemo.SetReadOnly(AValue: Boolean);
+begin
+  GetNativeMemo.ReadOnly := AValue;
+end;
+
+procedure TDpiMemo.SetScrollBars(AValue: TScrollStyle);
+begin
+  GetNativeMemo.ScrollBars := AValue;
+end;
+
+procedure TDpiMemo.SetWordWrap(AValue: Boolean);
+begin
+  GetNativeMemo.WordWrap := AValue;
+end;
+
+function TDpiMemo.GetNativeWinControl: TWinControl;
+begin
+  Result := GetNativeMemo;
 end;