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

carbon: changed menu items update, as suggested by Paul

Browse Source 
git-svn-id: trunk@20237 -
This commit is contained in:
dmitry 2009-05-26 11:11:57 +00:00
parent 6d68236e14
commit 0414cb7aa0
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lcl/interfaces/carbon/carbonmenus.pp
View File

@ -51,7 +51,6 @@ type
procedure MenuNeeded;
function GetIndex: Integer;
protected
procedure Update;
procedure RegisterEvents;
procedure Opening;
procedure Closed;
@ -74,6 +73,8 @@ type
procedure SetCheck(AChecked: Boolean);
procedure SetShortCut(AShortCut: TShortCut);
procedure SetStyle;
procedure Update;
end;
function CheckMenu(const Menu: HMENU; const AMethodName: String; AParamName: String = ''): Boolean;
@ -206,7 +207,10 @@ begin
Self, 'Update', 'SetMenuItemHierarchicalMenu');
SetCheck(LCLMenuItem.Checked);
SetBitmap(LCLMenuItem.Bitmap);
if (LCLMenuItem.HasIcon) then
SetBitmap(LCLMenuItem.Bitmap)
else
SetBitmap(nil);
SetStyle;
SetVisible(LCLMenuItem.Visible);
@ -582,7 +586,7 @@ begin
AHandle := nil;
CGImage := nil;
if (LCLMenuItem.HasIcon) and (ABitmap <> nil) and (ABitmap.Width > 0) and (ABitmap.Height > 0) then
if (ABitmap <> nil) and (ABitmap.Width > 0) and (ABitmap.Height > 0) then
begin
if not CheckBitmap(ABitmap.Handle, SName) then Exit;