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

lcl: menus: rename OnAdvancedDrawItem to OnDrawItem and change event call schema

Browse Source 
git-svn-id: trunk@51503 -
This commit is contained in:
ondrej 2016-02-05 19:56:04 +00:00
parent 4f97b4a412
commit 61f389ffdb
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lcl/interfaces/win32/win32wsmenus.pp
View File

@ -850,10 +850,10 @@ begin
CC.Handle := AHDC;
Result.cx := 0;
Result.cy := 0;
if Assigned(ParentMenu.OnMeasureItem) then
ParentMenu.OnMeasureItem(AMenuItem, CC, Result.cx, Result.cy);
if Assigned(AMenuItem.OnMeasureItem) then
AMenuItem.OnMeasureItem(AMenuItem, CC, Result.cx, Result.cy);
AMenuItem.OnMeasureItem(AMenuItem, CC, Result.cx, Result.cy)
else if Assigned(ParentMenu.OnMeasureItem) then
ParentMenu.OnMeasureItem(AMenuItem, CC, Result.cx, Result.cy);
finally
CC.Free;
end;
@ -1229,16 +1229,16 @@ begin
ParentMenu := AMenuItem.GetParentMenu;
if (ParentMenu<>nil) and ParentMenu.OwnerDraw
and (Assigned(ParentMenu.OnAdvancedDrawItem) or Assigned(AMenuItem.OnAdvancedDrawItem)) then
and (Assigned(ParentMenu.OnDrawItem) or Assigned(AMenuItem.OnDrawItem)) then
begin
CC := TControlCanvas.Create;
try
CC.Handle := AHDC;
ItemDrawState := ItemStateToDrawState(ItemState);
if Assigned(ParentMenu.OnAdvancedDrawItem) then
ParentMenu.OnAdvancedDrawItem(AMenuItem, CC, ARect, ItemDrawState);
if Assigned(AMenuItem.OnAdvancedDrawItem) then
AMenuItem.OnAdvancedDrawItem(AMenuItem, CC, ARect, ItemDrawState);
if Assigned(AMenuItem.OnDrawItem) then
AMenuItem.OnDrawItem(AMenuItem, CC, ARect, ItemDrawState)
else if Assigned(ParentMenu.OnDrawItem) then
ParentMenu.OnDrawItem(AMenuItem, CC, ARect, ItemDrawState);
finally
CC.Free;
end;

10
lcl/menus.pp
View File

@ -108,7 +108,7 @@ type
mihtDestroy
);
TAdvancedMenuDrawItemEvent = procedure(Sender: TObject; ACanvas: TCanvas;
TMenuDrawItemEvent = procedure(Sender: TObject; ACanvas: TCanvas;
ARect: TRect; AState: TOwnerDrawState) of object;
TMenuMeasureItemEvent = procedure(Sender: TObject; ACanvas: TCanvas;
var AWidth, AHeight: Integer) of object;
@ -126,9 +126,9 @@ type
FImageIndex: TImageIndex;
FItems: TList; // list of TMenuItem
FMenu: TMenu;
FOnAdvancedDrawItem: TAdvancedMenuDrawItemEvent;
FOnChange: TMenuChangeEvent;
FOnClick: TNotifyEvent;
FOnDrawItem: TMenuDrawItemEvent;
FOnMeasureItem: TMenuMeasureItemEvent;
FParent: TMenuItem;
FMenuItemHandlers: array[TMenuItemHandlerType] of TMethodList;
@ -290,7 +290,7 @@ type
property Visible: Boolean read FVisible write SetVisible
stored IsVisibleStored default True;
property OnClick: TNotifyEvent read FOnClick write FOnClick;
property OnAdvancedDrawItem: TAdvancedMenuDrawItemEvent read FOnAdvancedDrawItem write FOnAdvancedDrawItem;
property OnDrawItem: TMenuDrawItemEvent read FOnDrawItem write FOnDrawItem;
property OnMeasureItem: TMenuMeasureItemEvent read FOnMeasureItem write FOnMeasureItem;
end;
TMenuItemClass = class of TMenuItem;
@ -306,7 +306,7 @@ type
FImageChangeLink: TChangeLink;
FImages: TCustomImageList;
FItems: TMenuItem;
FOnAdvancedDrawItem: TAdvancedMenuDrawItemEvent;
FOnDrawItem: TMenuDrawItemEvent;
FOnChange: TMenuChangeEvent;
FOnMeasureItem: TMenuMeasureItemEvent;
FOwnerDraw: Boolean;
@ -363,7 +363,7 @@ type
property Items: TMenuItem read FItems;
property Images: TCustomImageList read FImages write SetImages;
property OwnerDraw: Boolean read FOwnerDraw write FOwnerDraw default False;
property OnAdvancedDrawItem: TAdvancedMenuDrawItemEvent read FOnAdvancedDrawItem write FOnAdvancedDrawItem;
property OnDrawItem: TMenuDrawItemEvent read FOnDrawItem write FOnDrawItem;
property OnMeasureItem: TMenuMeasureItemEvent read FOnMeasureItem write FOnMeasureItem;
end;