paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-19 23:49:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDEIntf: fixed TIDEMenuItem.HasBitmap

Browse Source 
git-svn-id: trunk@26415 -
This commit is contained in:
mattias 2010-07-02 13:43:07 +00:00
parent 84d3841016
commit e704481261
2 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
ideintf/menuintf.pas
View File

@ -19,6 +19,8 @@ unit MenuIntf;
{$mode objfpc}{$H+}
{off $DEFINE VerboseMenuIntf}
interface
uses
@ -82,6 +84,7 @@ type
public
constructor Create(const TheName: string); virtual;
destructor Destroy; override;
function GetImageList: TCustomImageList; virtual;
function HasBitmap: Boolean;
procedure CreateMenuItem; virtual;
function GetPath: string;
@ -741,11 +744,31 @@ begin
inherited Destroy;
end;
function TIDEMenuItem.GetImageList: TCustomImageList;
var
CurSection: TIDEMenuSection;
AMenu: TMenu;
begin
Result:=nil;
CurSection:=Section;
while CurSection<>nil do begin
Result:=CurSection.SubMenuImages;
if Result<>nil then exit;
if (CurSection.Section=nil) then begin
if CurSection.MenuItem<>nil then begin
AMenu:=CurSection.MenuItem.GetParentMenu;
if AMenu<>nil then
Result:=AMenu.Images;
end;
exit;
end;
CurSection:=CurSection.Section;
end;
end;
function TIDEMenuItem.HasBitmap: Boolean;
begin
Result:=((FBitmap<>nil) and (not FBitmap.Empty))
or ((ImageIndex>=0) and (Section<>nil) and (Section.SubMenuImages<>nil)
and (Section.SubMenuImages.Count>ImageIndex));
Result:=(FBitmap<>nil) or ((ImageIndex>=0) and (GetImageList<>nil));
end;
procedure TIDEMenuItem.CreateMenuItem;
@ -841,10 +864,22 @@ procedure TIDEMenuItem.ConsistencyCheck;
RaiseGDBException(s);
end;
procedure RaiseBitmapError;
var
s: String;
begin
s:='TIDEMenuItem.ConsistencyCheck Name="'+Name+'" Caption="'+DbgStr(Caption)+'"';
debugln(s);
debugln(['RaiseBitmapError HasBitmap=',HasBitmap,' MenuItem.HasBitmap=',MenuItem.HasBitmap]);
debugln(['RaiseBitmapError ImageIndex=',ImageIndex,' MenuItem.ImageIndex=',MenuItem.ImageIndex]);
debugln(['RaiseBitmapError ImageList=',dbgsname(GetImageList),' MenuItem.ImageIndex=',DbgSName(MenuItem.GetImageList)]);
RaiseError;
end;
begin
if MenuItem<>nil then begin
if MenuItem.HasBitmap<>HasBitmap then
RaiseError;
RaiseBitmapError;
if MenuItem.Enabled<>Enabled then
RaiseError;
if MenuItem.Visible<>Visible then

7
packager/packageeditor.pas
View File

@ -179,6 +179,7 @@ type
procedure CompilerOptionsBitBtnClick(Sender: TObject);
procedure CreateMakefileClick(Sender: TObject);
procedure FilePropsGroupBoxResize(Sender: TObject);
procedure FilesPopupMenuClose(Sender: TObject);
procedure FilesPopupMenuPopup(Sender: TObject);
procedure UsePopupMenuPopup(Sender: TObject);
procedure FilesTreeViewDblClick(Sender: TObject);
@ -1015,6 +1016,11 @@ begin
SetBounds(x,y,150,Height);
end;
procedure TPackageEditorForm.FilesPopupMenuClose(Sender: TObject);
begin
PackageEditorMenuRoot.MenuItem:=nil;
end;
procedure TPackageEditorForm.AddBitBtnClick(Sender: TObject);
procedure AddUnit(AddParams: TAddToPkgResult);
@ -1416,6 +1422,7 @@ begin
begin
Name := 'FilesPopupMenu';
OnPopup := @FilesPopupMenuPopup;
OnClose :=@FilesPopupMenuClose;
end;
UsePopupMenu := TPopupMenu.Create(Self);
with UsePopupMenu do