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

fixed 1.0.10 compilation

Browse Source 
git-svn-id: trunk@5375 -
This commit is contained in:
mattias 2004-04-05 07:43:14 +00:00
parent 2caa9fbfde
commit 388eec3000
2 changed files with 37 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
ide/mainbar.pas
View File

@ -357,8 +357,14 @@ type
TheOutputFilter: TOutputFilter; TheOutputFilter: TOutputFilter;
function CreateMenuSeparator : TMenuItem; function CreateMenuSeparator : TMenuItem;
procedure CreateMenuItem(MenuItemParent,MenuItem:TMenuItem;MenuItemName,MenuItemCaption:String;bmpName:String='';mnuEnabled:Boolean=true); procedure CreateMenuItem(MenuItemParent, MenuItem: TMenuItem;
procedure CreateMenuItemPkg(MenuItemParent,MenuItem:TMenuItem;MenuItemName,MenuItemCaption:String;bmpName:String=''); MenuItemName, MenuItemCaption: String);
procedure CreateMenuItem(MenuItemParent, MenuItem: TMenuItem;
MenuItemName, MenuItemCaption: String;
bmpName: String);
procedure CreateMenuItem(MenuItemParent, MenuItem: TMenuItem;
MenuItemName, MenuItemCaption: String;
bmpName: String; mnuEnabled: Boolean);
procedure SetupFileMenu; virtual; procedure SetupFileMenu; virtual;
procedure SetupEditMenu; virtual; procedure SetupEditMenu; virtual;
procedure SetupSearchMenu; virtual; procedure SetupSearchMenu; virtual;
@ -565,7 +571,21 @@ begin
Result.Caption := '-'; Result.Caption := '-';
end; end;
procedure TMainIDEBar.CreateMenuItem(MenuItemParent,MenuItem:TMenuItem;MenuItemName,MenuItemCaption:String;bmpName:String='';mnuEnabled:Boolean=true); procedure TMainIDEBar.CreateMenuItem(MenuItemParent, MenuItem: TMenuItem;
MenuItemName, MenuItemCaption: String);
begin
CreateMenuItem(MenuItemParent,MenuItem,MenuItemName,MenuItemCaption,'');
end;
procedure TMainIDEBar.CreateMenuItem(MenuItemParent, MenuItem: TMenuItem;
MenuItemName, MenuItemCaption: String; bmpName: String);
begin
CreateMenuItem(MenuItemParent,MenuItem,MenuItemName,MenuItemCaption,bmpName,
true);
end;
procedure TMainIDEBar.CreateMenuItem(MenuItemParent, MenuItem: TMenuItem;
MenuItemName, MenuItemCaption: String; bmpName: String; mnuEnabled: Boolean);
begin begin
MenuItem:=TMenuItem.Create(Self); MenuItem:=TMenuItem.Create(Self);
MenuItem.Name:=MenuItemName; MenuItem.Name:=MenuItemName;
@ -576,17 +596,6 @@ begin
MenuItem.Bitmap.LoadFromLazarusResource(bmpName); MenuItem.Bitmap.LoadFromLazarusResource(bmpName);
MenuItemParent.Add(MenuItem); MenuItemParent.Add(MenuItem);
end; end;
procedure TMainIDEBar.CreateMenuItemPkg(MenuItemParent,MenuItem:TMenuItem;MenuItemName,MenuItemCaption:String;bmpName:String='');
begin
MenuItem := TMenuItem.Create(Self);
MenuItem.Name:=MenuItemName;
MenuItem.Caption := MenuItemCaption;
if bmpName<>'' then
MenuItem.Bitmap.LoadFromLazarusResource(bmpName);
{$IFNDEF DisablePkgs}
MenuItemParent.Add(MenuItem);
{$ENDIF}
end;
procedure TMainIDEBar.SetupFileMenu; procedure TMainIDEBar.SetupFileMenu;
begin begin
@ -809,23 +818,17 @@ end;
procedure TMainIDEBar.SetupComponentsMenu; procedure TMainIDEBar.SetupComponentsMenu;
begin begin
CreateMenuItemPkg(mnuComponents,itmPkgOpenPackage,'itmPkgOpenPackage',lisMenuOpenPackage,'pkg_package'); CreateMenuItem(mnuComponents,itmPkgOpenPackage,'itmPkgOpenPackage',lisMenuOpenPackage,'pkg_package');
CreateMenuItemPkg(mnuComponents,itmPkgOpenPackageFile,'itmPkgOpenPackageFile',lisMenuOpenPackageFile,'pkg_package'); CreateMenuItem(mnuComponents,itmPkgOpenPackageFile,'itmPkgOpenPackageFile',lisMenuOpenPackageFile,'pkg_package');
CreateMenuItemPkg(mnuComponents,itmPkgOpenRecent,'itmPkgOpenRecent',lisMenuOpenRecentPkg,'pkg_package'); CreateMenuItem(mnuComponents,itmPkgOpenRecent,'itmPkgOpenRecent',lisMenuOpenRecentPkg,'pkg_package');
{$IFNDEF DisablePkgs}
mnuComponents.Add(CreateMenuSeparator); mnuComponents.Add(CreateMenuSeparator);
{$ENDIF}
CreateMenuItemPkg(mnuComponents,itmPkgAddCurUnitToPkg,'itmPkgAddCurUnitToPkg',lisMenuAddCurUnitToPkg,'pkg_addunittopackage'); CreateMenuItem(mnuComponents,itmPkgAddCurUnitToPkg,'itmPkgAddCurUnitToPkg',lisMenuAddCurUnitToPkg,'pkg_addunittopackage');
{$IFNDEF DisablePkgs}
mnuComponents.Add(CreateMenuSeparator); mnuComponents.Add(CreateMenuSeparator);
{$ENDIF}
CreateMenuItemPkg(mnuComponents,itmPkgPkgGraph,'itmPkgPkgGraph',lisMenuPackageGraph,'pkg_packagegraph'); CreateMenuItem(mnuComponents,itmPkgPkgGraph,'itmPkgPkgGraph',lisMenuPackageGraph,'pkg_packagegraph');
{$IFNDEF DisablePkgs}
mnuComponents.Add(CreateMenuSeparator); mnuComponents.Add(CreateMenuSeparator);
{$ENDIF}
CreateMenuItem(mnuComponents,itmCompsConfigCustomComps,'itmCompsConfigCustomComps',lisMenuConfigCustomComps); CreateMenuItem(mnuComponents,itmCompsConfigCustomComps,'itmCompsConfigCustomComps',lisMenuConfigCustomComps);

5
lcl/interfaces/gtk/gtkwinapiwindow.pp
View File

@ -1132,13 +1132,16 @@ begin
end; end;
initialization initialization
MParentClass := nil; MParentClass:=nil;
end. end.
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.56 2004/04/05 07:43:14 mattias
fixed 1.0.10 compilation
Revision 1.55 2004/04/04 01:42:31 vincents Revision 1.55 2004/04/04 01:42:31 vincents
Fixed 1.0.x compilation Fixed 1.0.x compilation