paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-16 11:29:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Renaming TVirtualStringTree to TLazVirtualStringTree and TVirtualDrawTree to TLazVirtualDrawTree to prevent conflict with an external version of the package

Browse Source
This commit is contained in:
balazs 2023-01-02 10:41:30 +02:00
parent ff2bda14d1
commit c40e3341bd
2 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
components/virtualtreeview/laz.virtualtrees.pas
View File

@ -3611,7 +3611,7 @@ type
property Text[Node: PVirtualNode; Column: TColumnIndex]: String read GetText write SetText;
end;
TVirtualStringTree = class(TCustomVirtualStringTree)
TLazVirtualStringTree = class(TCustomVirtualStringTree)
private
function GetOptions: TStringTreeOptions;
procedure SetOptions(const Value: TStringTreeOptions);
@ -3863,8 +3863,6 @@ type
//property Touch;
end;
TLazVirtualStringTree = class(TVirtualStringTree);
TVTDrawNodeEvent = procedure(Sender: TBaseVirtualTree; const PaintInfo: TVTPaintInfo) of object;
TVTGetCellContentMarginEvent = procedure(Sender: TBaseVirtualTree; HintCanvas: TCanvas; Node: PVirtualNode;
Column: TColumnIndex; CellContentMarginType: TVTCellContentMarginType; var CellContentMargin: TPoint) of object;
@ -3889,7 +3887,7 @@ type
property OnGetNodeWidth: TVTGetNodeWidthEvent read FOnGetNodeWidth write FOnGetNodeWidth;
end;
TVirtualDrawTree = class(TCustomVirtualDrawTree)
TLazVirtualDrawTree = class(TCustomVirtualDrawTree)
private
function GetOptions: TVirtualTreeOptions;
procedure SetOptions(const Value: TVirtualTreeOptions);
@ -4121,7 +4119,6 @@ type
{$ifend}
end;
TLazVirtualDrawTree = class(TVirtualDrawTree);
// OLE Clipboard and drag'n drop helper
procedure EnumerateVTClipboardFormats(TreeClass: TVirtualTreeClass; const List: TStrings); overload;
@ -35759,9 +35756,9 @@ begin
end;
end;
//----------------- TVirtualStringTree ---------------------------------------------------------------------------------
//----------------- TLazVirtualStringTree ---------------------------------------------------------------------------------
function TVirtualStringTree.GetOptions: TStringTreeOptions;
function TLazVirtualStringTree.GetOptions: TStringTreeOptions;
begin
Result := FOptions as TStringTreeOptions;
@ -35769,7 +35766,7 @@ end;
//----------------------------------------------------------------------------------------------------------------------
procedure TVirtualStringTree.SetOptions(const Value: TStringTreeOptions);
procedure TLazVirtualStringTree.SetOptions(const Value: TStringTreeOptions);
begin
FOptions.Assign(Value);
@ -35777,7 +35774,7 @@ end;
//----------------------------------------------------------------------------------------------------------------------
function TVirtualStringTree.GetOptionsClass: TTreeOptionsClass;
function TLazVirtualStringTree.GetOptionsClass: TTreeOptionsClass;
begin
Result := TStringTreeOptions;
@ -35786,9 +35783,9 @@ end;
//----------------------------------------------------------------------------------------------------------------------
{$if CompilerVersion >= 23}
class constructor TVirtualStringTree.Create();
class constructor TLazVirtualStringTree.Create();
begin
TCustomStyleEngine.RegisterStyleHook(TVirtualStringTree, TVclStyleScrollBarsHook);
TCustomStyleEngine.RegisterStyleHook(TLazVirtualStringTree, TVclStyleScrollBarsHook);
end;
{$ifend}
@ -35834,9 +35831,9 @@ begin
Result := vhkOwnerDraw;
end;
//----------------- TVirtualDrawTree -----------------------------------------------------------------------------------
//----------------- TLazVirtualDrawTree -----------------------------------------------------------------------------------
function TVirtualDrawTree.GetOptions: TVirtualTreeOptions;
function TLazVirtualDrawTree.GetOptions: TVirtualTreeOptions;
begin
Result := FOptions as TVirtualTreeOptions;
@ -35844,7 +35841,7 @@ end;
//----------------------------------------------------------------------------------------------------------------------
procedure TVirtualDrawTree.SetOptions(const Value: TVirtualTreeOptions);
procedure TLazVirtualDrawTree.SetOptions(const Value: TVirtualTreeOptions);
begin
FOptions.Assign(Value);
@ -35852,7 +35849,7 @@ end;
//----------------------------------------------------------------------------------------------------------------------
function TVirtualDrawTree.GetOptionsClass: TTreeOptionsClass;
function TLazVirtualDrawTree.GetOptionsClass: TTreeOptionsClass;
begin
Result := TVirtualTreeOptions;
@ -35861,9 +35858,9 @@ end;
//----------------------------------------------------------------------------------------------------------------------
{$if CompilerVersion >= 23}
class constructor TVirtualDrawTree.Create();
class constructor TLazVirtualDrawTree.Create();
begin
TCustomStyleEngine.RegisterStyleHook(TVirtualDrawTree, TVclStyleScrollBarsHook);
TCustomStyleEngine.RegisterStyleHook(TLazVirtualDrawTree, TVclStyleScrollBarsHook);
end;
{$ifend}

18
components/virtualtreeview/laz.vtaccessibility.pas
View File

@ -14,7 +14,7 @@ uses
type
TVirtualTreeAccessibility = class(TInterfacedObject, IDispatch, IAccessible)
private
FVirtualTree: TVirtualStringTree;
FVirtualTree: TLazVirtualStringTree;
public
{ IAccessibility }
function Get_accParent(out ppdispParent: IDispatch): HResult; stdcall;
@ -49,7 +49,7 @@ type
function Invoke(DispID: Integer; const IID: TGUID; LocaleID: Integer;
Flags: Word; var Params; VarResult: Pointer; ExcepInfo: Pointer;
ArgErr: Pointer): HRESULT; stdcall;
constructor Create(VirtualTree: TVirtualStringTree);
constructor Create(VirtualTree: TLazVirtualStringTree);
end;
TVirtualTreeItemAccessibility = class(TVirtualTreeAccessibility, IAccessible)
@ -66,7 +66,7 @@ type
function accLocation(out pxLeft: Integer;
out pyTop: Integer; out pcxWidth: Integer;
out pcyHeight: Integer; varChild: OleVariant): HResult; stdcall;
constructor Create(VirtualTree: TVirtualStringTree);
constructor Create(VirtualTree: TLazVirtualStringTree);
end;
TVTMultiColumnItemAccessibility = class(TVirtualTreeItemAccessibility, IAccessible)
@ -179,7 +179,7 @@ begin
end;
//----------------------------------------------------------------------------------------------------------------------
constructor TVirtualTreeAccessibility.Create(VirtualTree: TVirtualStringTree);
constructor TVirtualTreeAccessibility.Create(VirtualTree: TLazVirtualStringTree);
// assigns the parent and current fields, and lets the control's iAccessible object know its address.
begin
fVirtualTree := VirtualTree;
@ -433,7 +433,7 @@ begin
end;
//----------------------------------------------------------------------------------------------------------------------
constructor TVirtualTreeItemAccessibility.Create(VirtualTree: TVirtualStringTree);
constructor TVirtualTreeItemAccessibility.Create(VirtualTree: TLazVirtualStringTree);
// sets up the parent/child relationship.
begin
fVirtualTree := VirtualTree;
@ -617,7 +617,7 @@ end;
function TVTDefaultAccessibleProvider.CreateIAccessible(
ATree: TBaseVirtualTree): IAccessible;
begin
result := TVirtualTreeAccessibility.Create(TVirtualStringTree(ATree));
result := TVirtualTreeAccessibility.Create(TLazVirtualStringTree(ATree));
end;
{ TVTDefaultAccessibleItemProvider }
@ -625,7 +625,7 @@ end;
function TVTDefaultAccessibleItemProvider.CreateIAccessible(
ATree: TBaseVirtualTree): IAccessible;
begin
result := TVirtualTreeItemAccessibility.Create(TVirtualStringTree(ATree));
result := TVirtualTreeItemAccessibility.Create(TLazVirtualStringTree(ATree));
end;
{ TVTMultiColumnAccessibleItemProvider }
@ -634,8 +634,8 @@ function TVTMultiColumnAccessibleItemProvider.CreateIAccessible(
ATree: TBaseVirtualTree): IAccessible;
begin
result := nil;
if TVirtualStringTree(ATree).Header.UseColumns then
result := TVTMultiColumnItemAccessibility.Create(TVirtualStringTree(ATree));
if TLazVirtualStringTree(ATree).Header.UseColumns then
result := TVTMultiColumnItemAccessibility.Create(TLazVirtualStringTree(ATree));
end;
var