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

LCL: deprecate OnEditButtonClick and introduce OnButtonClick with more params. Issue #19377

Browse Source 
git-svn-id: trunk@30807 -
This commit is contained in:
juha 2011-05-19 12:22:25 +00:00
parent ccd2349b54
commit 5d298f145e
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lcl/grids.pas
View File

@ -645,6 +645,7 @@ type
FDefColWidth, FDefRowHeight: Integer; FDefColWidth, FDefRowHeight: Integer;
FCol,FRow, FFixedCols, FFixedRows: Integer; FCol,FRow, FFixedCols, FFixedRows: Integer;
FOnEditButtonClick: TNotifyEvent; FOnEditButtonClick: TNotifyEvent;
FOnButtonClick: TOnSelectEvent;
FOnPickListSelect: TNotifyEvent; FOnPickListSelect: TNotifyEvent;
FOnCheckboxToggled: TToggledCheckboxEvent; FOnCheckboxToggled: TToggledCheckboxEvent;
FOnPrepareCanvas: TOnPrepareCanvasEvent; FOnPrepareCanvas: TOnPrepareCanvasEvent;
@ -1064,7 +1065,9 @@ type
property OnCompareCells: TOnCompareCells read FOnCompareCells write FOnCompareCells; property OnCompareCells: TOnCompareCells read FOnCompareCells write FOnCompareCells;
property OnPrepareCanvas: TOnPrepareCanvasEvent read FOnPrepareCanvas write FOnPrepareCanvas; property OnPrepareCanvas: TOnPrepareCanvasEvent read FOnPrepareCanvas write FOnPrepareCanvas;
property OnDrawCell: TOnDrawCell read FOnDrawCell write FOnDrawCell; property OnDrawCell: TOnDrawCell read FOnDrawCell write FOnDrawCell;
property OnEditButtonClick: TNotifyEvent read FOnEditButtonClick write FOnEditButtonClick; // Deprecated in favor of OnButtonClick.
property OnEditButtonClick: TNotifyEvent read FOnEditButtonClick write FOnEditButtonClick; deprecated;
property OnButtonClick: TOnSelectEvent read FOnButtonClick write FOnButtonClick;
property OnPickListSelect: TNotifyEvent read FOnPickListSelect write FOnPickListSelect; property OnPickListSelect: TNotifyEvent read FOnPickListSelect write FOnPickListSelect;
property OnSelection: TOnSelectEvent read fOnSelection write fOnSelection; property OnSelection: TOnSelectEvent read fOnSelection write fOnSelection;
property OnSelectEditor: TSelectEditorEvent read FOnSelectEditor write FOnSelectEditor; property OnSelectEditor: TSelectEditorEvent read FOnSelectEditor write FOnSelectEditor;
@ -1275,7 +1278,8 @@ type
property OnDragDrop; property OnDragDrop;
property OnDragOver; property OnDragOver;
property OnDrawCell; property OnDrawCell;
property OnEditButtonClick; property OnEditButtonClick; deprecated;
property OnButtonClick;
property OnEndDock; property OnEndDock;
property OnEndDrag; property OnEndDrag;
property OnEnter; property OnEnter;
@ -1374,7 +1378,8 @@ type
property OnDragDrop; property OnDragDrop;
property OnDragOver; property OnDragOver;
property OnDrawCell; property OnDrawCell;
property OnEditButtonClick; property OnEditButtonClick; deprecated;
property OnButtonClick;
property OnEditingDone; property OnEditingDone;
property OnEndDock; property OnEndDock;
property OnEndDrag; property OnEndDrag;
@ -1574,7 +1579,8 @@ type
property OnDragOver; property OnDragOver;
property OnDblClick; property OnDblClick;
property OnDrawCell; property OnDrawCell;
property OnEditButtonClick; property OnEditButtonClick; deprecated;
property OnButtonClick;
property OnEditingDone; property OnEditingDone;
property OnEndDock; property OnEndDock;
property OnEndDrag; property OnEndDrag;
@ -3764,7 +3770,7 @@ end;
procedure TCustomGrid.EditButtonClicked(Sender: TObject); procedure TCustomGrid.EditButtonClicked(Sender: TObject);
begin begin
if Assigned(OnEditButtonClick) then begin if Assigned(OnEditButtonClick) or Assigned(OnButtonClick) then begin
if Sender=FButtonEditor then if Sender=FButtonEditor then
DoEditButtonClick(FButtonEditor.Col, FButtonEditor.Row) DoEditButtonClick(FButtonEditor.Col, FButtonEditor.Row)
else else
@ -5840,7 +5846,7 @@ begin
if fGridState=gsHeaderClicking then if fGridState=gsHeaderClicking then
HeaderClick(True, FGCache.ClickCell.X) HeaderClick(True, FGCache.ClickCell.X)
else else
if Assigned(OnEditButtonClick) then if Assigned(OnEditButtonClick) or Assigned(OnButtonClick) then
DoEditButtonClick(Cur.X, Cur.Y); DoEditButtonClick(Cur.X, Cur.Y);
end; end;
@ -6060,7 +6066,10 @@ begin
try try
FCol:=ACol; FCol:=ACol;
FRow:=ARow; FRow:=ARow;
OnEditButtonClick(Self); if Assigned(OnEditButtonClick) then
OnEditButtonClick(Self);
if Assigned(OnButtonClick) then
OnButtonClick(Self, ACol, ARow);
finally finally
if (FCol=ACol) and (FRow=ARow) then if (FCol=ACol) and (FRow=ARow) then
begin begin