From 61d2a8145f52d05b3d823c0ced2f0ad532107660 Mon Sep 17 00:00:00 2001 From: mattias Date: Sat, 17 Aug 2002 23:41:20 +0000 Subject: [PATCH] published TControl help properties git-svn-id: trunk@2393 - --- lcl/controls.pp | 19 ++++++++++++++---- lcl/include/control.inc | 44 ++++++++++++++++++++++++++++++++++------- 2 files changed, 52 insertions(+), 11 deletions(-) diff --git a/lcl/controls.pp b/lcl/controls.pp index 2f0e33b07e..5b0db9faeb 100644 --- a/lcl/controls.pp +++ b/lcl/controls.pp @@ -535,6 +535,7 @@ type function GetClientHeight: Integer; function GetClientWidth: Integer; function IsHelpContextStored: boolean; + function IsHelpKeyWordStored: boolean; procedure SetAlign(Value : TAlign); procedure SetBoundsRect(const Rect : TRect); procedure SetClientHeight(Value: Integer); @@ -675,7 +676,6 @@ type property OnMouseEnter: TNotifyEvent read FOnMouseEnter write FOnMouseEnter; property OnMouseLeave: TNotifyEvent read FOnMouseLeave write FOnMouseLeave; property OnStartDrag: TStartDragEvent read FOnStartDrag write FOnStartDrag; - public FCompStyle : LongInt; Function PerformTab : Boolean; Virtual; @@ -733,9 +733,6 @@ type property OnResize: TNotifyEvent read FOnResize write FOnResize; property OnClick: TNotifyEvent read FOnClick write FOnClick; property OnShowHint: TControlShowHintEvent read FOnShowHint write FOnShowHint; - property HelpType: THelpType read FHelpType write FHelpType default htContext; - property HelpKeyword: String read FHelpKeyword write SetHelpKeyword stored IsHelpContextStored; - property HelpContext: THelpContext read FHelpContext write SetHelpContext stored IsHelpContextStored default 0; published property Cursor: TCursor read FCursor write SetCursor default crDefault; property Left: Integer read FLeft write SetLeft; @@ -743,6 +740,9 @@ type property Hint: String read FHint write SetHint; property Top: Integer read FTop write SetTop; property Width: Integer read FWidth write SetWidth; + property HelpType: THelpType read FHelpType write FHelpType default htContext; + property HelpKeyword: String read FHelpKeyword write SetHelpKeyword stored IsHelpKeyWordStored; + property HelpContext: THelpContext read FHelpContext write SetHelpContext stored IsHelpContextStored default 0; end; @@ -763,6 +763,14 @@ type TGetChildProc = procedure(Child: TComponent) of Object; + { TWinControlActionLink } + + TWinControlActionLink = class(TControlActionLink) + end; + + TWinControlActionLinkClass = class of TWinControlActionLink; + + { TWinControl } TWinControlFlag = (wcfClientRectNeedsUpdate,wcfColorChanged); @@ -1453,6 +1461,9 @@ end. { ============================================================================= $Log$ + Revision 1.115 2003/04/11 08:09:26 mattias + published TControl help properties + Revision 1.114 2003/04/07 01:59:25 mattias implemented package iterations diff --git a/lcl/include/control.inc b/lcl/include/control.inc index 3ec2ab6091..5d79bba113 100644 --- a/lcl/include/control.inc +++ b/lcl/include/control.inc @@ -1,3 +1,5 @@ +// included by controls.pp + {****************************************************************************** TControl ****************************************************************************** @@ -252,9 +254,26 @@ begin Result := ClientRect.Right; end; +{------------------------------------------------------------------------------ + function TControl.IsHelpContextStored: boolean; +------------------------------------------------------------------------------} function TControl.IsHelpContextStored: boolean; begin - Result:=false; + if ActionLink=nil then + Result := HelpContext<>0 + else + Result := not ActionLink.IsHelpContextLinked; +end; + +{------------------------------------------------------------------------------ + function TControl.IsHelpKeyWordStored: boolean; +------------------------------------------------------------------------------} +function TControl.IsHelpKeyWordStored: boolean; +begin + if ActionLink=nil then + Result := HelpKeyword<>'' + else + Result := not ActionLink.IsHelpContextLinked; end; {------------------------------------------------------------------------------} @@ -1602,9 +1621,9 @@ begin end; -{------------------------------------------------------------------------------} -{ TControl SetHeight } -{------------------------------------------------------------------------------} +{------------------------------------------------------------------------------ + TControl SetHeight +------------------------------------------------------------------------------} procedure TControl.SetHeight(Value: Integer); begin {$IFDEF CHECK_POSITION} @@ -1613,21 +1632,27 @@ begin SetBounds(FLeft, FTop, FWidth, Value); end; +{------------------------------------------------------------------------------ + procedure TControl.SetHelpContext(const AValue: THelpContext); +------------------------------------------------------------------------------} procedure TControl.SetHelpContext(const AValue: THelpContext); begin if FHelpContext=AValue then exit; FHelpContext:=AValue; end; +{------------------------------------------------------------------------------ + procedure TControl.SetHelpKeyword(const AValue: String); +------------------------------------------------------------------------------} procedure TControl.SetHelpKeyword(const AValue: String); begin if FHelpKeyword=AValue then exit; FHelpKeyword:=AValue; end; -{------------------------------------------------------------------------------} -{ TControl SetParent } -{------------------------------------------------------------------------------} +{------------------------------------------------------------------------------ + Procedure TControl.SetParent(AParent : TWinControl); +------------------------------------------------------------------------------} Procedure TControl.SetParent(AParent : TWinControl); begin { if AParent = nil @@ -2077,8 +2102,13 @@ end; {$C-} {$ENDIF} +// included by controls.pp + { ============================================================================= $Log$ + Revision 1.122 2003/04/11 08:09:26 mattias + published TControl help properties + Revision 1.121 2003/04/10 09:22:42 mattias implemented changing dependency version