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

LCL/Grids: Undo part of r60571 #730fb31994. What is left fixes drawing of user-provided checkboxes for TDBGrid and can be back-ported to Fixes (issue #35085)

Browse Source 
git-svn-id: trunk@60578 -
This commit is contained in:
wp 2019-03-04 10:08:39 +00:00
parent 99c565049a
commit 094543b6cb
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lcl/dbgrids.pas
View File

@ -670,7 +670,6 @@ type
property OnStartDrag; property OnStartDrag;
property OnTitleClick; property OnTitleClick;
property OnUserCheckboxBitmap; property OnUserCheckboxBitmap;
property OnUserCheckboxImage;
property OnUserCheckboxState; property OnUserCheckboxState;
property OnUTF8KeyPress; property OnUTF8KeyPress;
end; end;

12
lcl/grids.pas
View File

@ -368,12 +368,6 @@ type
const CheckedState: TCheckboxState; const CheckedState: TCheckboxState;
var ABitmap: TBitmap) of object; var ABitmap: TBitmap) of object;
TUserCheckBoxImageEvent =
procedure(Sender: TObject; const aCol, aRow: Integer;
const CheckedState: TCheckBoxState;
var ImageList: TCustomImageList;
var ImageIndex: TImageIndex) of object;
TValidateEntryEvent = TValidateEntryEvent =
procedure(sender: TObject; aCol, aRow: Integer; procedure(sender: TObject; aCol, aRow: Integer;
const OldValue: string; var NewValue: String) of object; const OldValue: string; var NewValue: String) of object;
@ -734,7 +728,6 @@ type
FRangeSelectMode: TRangeSelectMode; FRangeSelectMode: TRangeSelectMode;
FSelections: TGridRectArray; FSelections: TGridRectArray;
FOnUserCheckboxBitmap: TUserCheckboxBitmapEvent; FOnUserCheckboxBitmap: TUserCheckboxBitmapEvent;
FOnUserCheckboxImage: TUserCheckBoxImageEvent;
FSortOrder: TSortOrder; FSortOrder: TSortOrder;
FSortColumn: Integer; FSortColumn: Integer;
FSortLCLImages: TLCLGlyphs; FSortLCLImages: TLCLGlyphs;
@ -1254,7 +1247,6 @@ type
property OnSelectEditor: TSelectEditorEvent read FOnSelectEditor write FOnSelectEditor; property OnSelectEditor: TSelectEditorEvent read FOnSelectEditor write FOnSelectEditor;
property OnTopLeftChanged: TNotifyEvent read FOnTopLeftChanged write FOnTopLeftChanged; property OnTopLeftChanged: TNotifyEvent read FOnTopLeftChanged write FOnTopLeftChanged;
property OnUserCheckboxBitmap: TUserCheckboxBitmapEvent read FOnUserCheckboxBitmap write FOnUserCheckboxBitmap; property OnUserCheckboxBitmap: TUserCheckboxBitmapEvent read FOnUserCheckboxBitmap write FOnUserCheckboxBitmap;
property OnUserCheckboxImage: TUserCheckBoxImageEvent read FOnUserCheckboxImage write FOnUserCheckboxImage;
property OnValidateEntry: TValidateEntryEvent read FOnValidateEntry write FOnValidateEntry; property OnValidateEntry: TValidateEntryEvent read FOnValidateEntry write FOnValidateEntry;
// Bidi functions // Bidi functions
function FlipRect(ARect: TRect): TRect; function FlipRect(ARect: TRect): TRect;
@ -1637,7 +1629,6 @@ type
property OnStartDrag; property OnStartDrag;
property OnTopleftChanged; property OnTopleftChanged;
property OnUserCheckboxBitmap; property OnUserCheckboxBitmap;
property OnUserCheckboxImage;
property OnUTF8KeyPress; property OnUTF8KeyPress;
property OnValidateEntry; property OnValidateEntry;
end; end;
@ -1878,7 +1869,6 @@ type
property OnStartDrag; property OnStartDrag;
property OnTopLeftChanged; property OnTopLeftChanged;
property OnUserCheckboxBitmap; property OnUserCheckboxBitmap;
property OnUserCheckboxImage;
property OnUTF8KeyPress; property OnUTF8KeyPress;
property OnValidateEntry; property OnValidateEntry;
end; end;
@ -5531,8 +5521,6 @@ procedure TCustomGrid.GetImageForCheckBox(const aCol, aRow: Integer;
begin begin
if Assigned(OnUserCheckboxBitmap) then if Assigned(OnUserCheckboxBitmap) then
OnUserCheckboxBitmap(Self, aCol, aRow, CheckBoxView, Bitmap); OnUserCheckboxBitmap(Self, aCol, aRow, CheckBoxView, Bitmap);
if (Bitmap = nil) and Assigned(OnUserCheckBoxImage) then
OnUserCheckboxImage(Self, aCol, aRow, CheckBoxView, ImageList, ImageIndex);
end; end;
procedure TCustomGrid.AdjustInnerCellRect(var ARect: TRect); procedure TCustomGrid.AdjustInnerCellRect(var ARect: TRect);