From dbab5c2b7f03118f86fa1a17ae2b94acbe412151 Mon Sep 17 00:00:00 2001 From: Graeme Geldenhuys Date: Fri, 26 Apr 2013 00:53:01 +0100 Subject: Only enable the debug interface when needed. --- src/gui/fpg_tree.pas | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gui/fpg_tree.pas') diff --git a/src/gui/fpg_tree.pas b/src/gui/fpg_tree.pas index 8935ec36..1454b2a7 100644 --- a/src/gui/fpg_tree.pas +++ b/src/gui/fpg_tree.pas @@ -273,10 +273,10 @@ type implementation -{.$IFDEF DEBUG} +{$IFDEF DEBUG} uses dbugintf; -{.$ENDIF} +{$ENDIF} type PColumnLeft = ^integer; -- cgit v1.2.3-70-g09d2 From bc53e200bffaa30dd654abb7ea32839ccf77030a Mon Sep 17 00:00:00 2001 From: Graeme Geldenhuys Date: Tue, 27 Aug 2013 10:29:13 +0100 Subject: Replaced the FPC dbugintf unit with the customised fpGUI one. --- src/corelib/fpg_base.pas | 2 +- src/corelib/fpg_main.pas | 2 +- src/gui/fpg_combobox.pas | 2 +- src/gui/fpg_tree.pas | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/gui/fpg_tree.pas') diff --git a/src/corelib/fpg_base.pas b/src/corelib/fpg_base.pas index 11f3a78c..18333335 100644 --- a/src/corelib/fpg_base.pas +++ b/src/corelib/fpg_base.pas @@ -793,7 +793,7 @@ uses typinfo, process, {$IFDEF GDEBUG} - dbugintf, + fpg_dbugintf, {$ENDIF} dateutils; diff --git a/src/corelib/fpg_main.pas b/src/corelib/fpg_main.pas index c037617c..545b899e 100644 --- a/src/corelib/fpg_main.pas +++ b/src/corelib/fpg_main.pas @@ -462,7 +462,7 @@ uses Agg2D, {$endif} {$IFDEF DEBUG} - dbugintf, + fpg_dbugintf, {$ENDIF} fpg_imgfmt_bmp, fpg_stdimages, diff --git a/src/gui/fpg_combobox.pas b/src/gui/fpg_combobox.pas index 111d4c66..15dae337 100644 --- a/src/gui/fpg_combobox.pas +++ b/src/gui/fpg_combobox.pas @@ -190,7 +190,7 @@ implementation uses fpg_listbox, {$IFDEF DEBUG} - dbugintf, + fpg_dbugintf, {$ENDIF} math; diff --git a/src/gui/fpg_tree.pas b/src/gui/fpg_tree.pas index 1454b2a7..5e1008c2 100644 --- a/src/gui/fpg_tree.pas +++ b/src/gui/fpg_tree.pas @@ -275,7 +275,7 @@ implementation {$IFDEF DEBUG} uses - dbugintf; + fpg_dbugintf; {$ENDIF} type -- cgit v1.2.3-70-g09d2 From 5e560279ccf4affbebbb28ccb8cd03d3e8b6ccce Mon Sep 17 00:00:00 2001 From: Graeme Geldenhuys Date: Sun, 27 Apr 2014 01:23:36 +0100 Subject: tree node: new TreeView property to show which tree view a TreeNode belongs too. --- src/gui/fpg_tree.pas | 1 + 1 file changed, 1 insertion(+) (limited to 'src/gui/fpg_tree.pas') diff --git a/src/gui/fpg_tree.pas b/src/gui/fpg_tree.pas index 5e1008c2..d0526974 100644 --- a/src/gui/fpg_tree.pas +++ b/src/gui/fpg_tree.pas @@ -133,6 +133,7 @@ type property Parent: TfpgTreeNode read FParent write SetParent; property Prev: TfpgTreeNode read FPrev write FPrev; property Text: TfpgString read FText write SetText; + property TreeView: TfpgTreeView read FTree; { determines the + or - image in the treeview } property HasChildren: Boolean read FHasChildren write SetHasChildren; // color settings -- cgit v1.2.3-70-g09d2 From 5611d5b29fae879011cbabf6feceb073cb23b08a Mon Sep 17 00:00:00 2001 From: Graeme Geldenhuys Date: Sun, 27 Apr 2014 19:56:02 +0100 Subject: treenode: new overloaded constructor and FTree moved to protected section. --- src/gui/fpg_tree.pas | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'src/gui/fpg_tree.pas') diff --git a/src/gui/fpg_tree.pas b/src/gui/fpg_tree.pas index d0526974..7da5205c 100644 --- a/src/gui/fpg_tree.pas +++ b/src/gui/fpg_tree.pas @@ -84,7 +84,6 @@ type FText: TfpgString; FTextColor: TfpgColor; FHasChildren: Boolean; - FTree: TfpgTreeView; procedure SetCollapsed(const AValue: boolean); procedure SetInactSelColor(const AValue: TfpgColor); procedure SetInactSelTextColor(const AValue: TfpgColor); @@ -97,8 +96,11 @@ type procedure SetHasChildren(const AValue: Boolean); procedure DoTreeCheck(ANode: TfpgTreeNode); procedure SetStateImageIndex(const AValue: integer); + protected + FTree: TfpgTreeView; public - constructor Create; + constructor Create; overload; + constructor Create(ATreeView: TfpgTreeView; AText: TfpgString); overload; destructor Destroy; override; // node related function AppendText(AText: TfpgString): TfpgTreeNode; @@ -395,7 +397,8 @@ begin FData := nil; FFirstSubNode := nil; FLastSubNode := nil; - FText := ''; + FText := ''; + FTree := nil; FImageIndex := -1; FStateImageIndex := -1; FCollapsed := True; @@ -412,6 +415,13 @@ begin FInactSelTextColor := clUnset; end; +constructor TfpgTreeNode.Create(ATreeView: TfpgTreeView; AText: TfpgString); +begin + Create; + FText := AText; + FTree := ATreeView; +end; + destructor TfpgTreeNode.Destroy; begin if FParent <> nil then -- cgit v1.2.3-70-g09d2