From e8e2846b3e6ea420f0b8fb2116d46028bd5a2202 Mon Sep 17 00:00:00 2001 From: mattias Date: Fri, 13 Aug 2004 01:15:48 +0000 Subject: [PATCH] fixed fpc 1.0.10 compilation git-svn-id: trunk@5775 - --- designer/designer.pp | 26 +++++++++++++------------- ide/objectlists.pas | 10 +++++----- ideintf/actionseditor.pas | 11 ++++++++++- 3 files changed, 28 insertions(+), 19 deletions(-) diff --git a/designer/designer.pp b/designer/designer.pp index f2d780df50..b92a44d210 100644 --- a/designer/designer.pp +++ b/designer/designer.pp @@ -176,10 +176,10 @@ type procedure SelectParentOfSelection; function DoCopySelectionToClipboard: boolean; function GetPasteParent: TComponent; - function DoPasteSelectionFromClipboard(Flags: TComponentPasteSelectionFlags + function DoPasteSelectionFromClipboard(PasteFlags: TComponentPasteSelectionFlags ): boolean; function DoInsertFromStream(s: TStream; PasteParent: TComponent; - Flags: TComponentPasteSelectionFlags): Boolean; + PasteFlags: TComponentPasteSelectionFlags): Boolean; procedure DoShowTabOrderEditor; procedure DoShowChangeClassDialog; procedure GiveComponentsNames; @@ -223,11 +223,11 @@ type function CopySelection: boolean; override; function CutSelection: boolean; override; function CanPaste: Boolean; override; - function PasteSelection(Flags: TComponentPasteSelectionFlags): boolean; override; + function PasteSelection(PasteFlags: TComponentPasteSelectionFlags): boolean; override; function DeleteSelection: boolean; override; function CopySelectionToStream(AllComponentsStream: TStream): boolean; override; function InsertFromStream(s: TStream; Parent: TComponent; - Flags: TComponentPasteSelectionFlags): Boolean; override; + PasteFlags: TComponentPasteSelectionFlags): Boolean; override; function InvokeComponentEditor(AComponent: TComponent; MenuIndex: integer): boolean; override; procedure DoProcessCommand(Sender: TObject; var Command: word; @@ -520,9 +520,9 @@ begin end; function TDesigner.InsertFromStream(s: TStream; Parent: TComponent; - Flags: TComponentPasteSelectionFlags): Boolean; + PasteFlags: TComponentPasteSelectionFlags): Boolean; begin - Result:=DoInsertFromStream(s,Parent,Flags); + Result:=DoInsertFromStream(s,Parent,PasteFlags); end; function TDesigner.DoCopySelectionToClipboard: boolean; @@ -581,7 +581,7 @@ begin end; function TDesigner.DoPasteSelectionFromClipboard( - Flags: TComponentPasteSelectionFlags): boolean; + PasteFlags: TComponentPasteSelectionFlags): boolean; var PasteParent: TComponent; AllComponentText: string; @@ -596,7 +596,7 @@ begin try CurTextCompStream.Write(AllComponentText[1],length(AllComponentText)); PasteParent:=GetPasteParent; - if not DoInsertFromStream(CurTextCompStream,PasteParent,Flags) then + if not DoInsertFromStream(CurTextCompStream,PasteParent,PasteFlags) then exit; finally CurTextCompStream.Free; @@ -605,7 +605,7 @@ begin end; function TDesigner.DoInsertFromStream(s: TStream; - PasteParent: TComponent; Flags: TComponentPasteSelectionFlags): Boolean; + PasteParent: TComponent; PasteFlags: TComponentPasteSelectionFlags): Boolean; var AllComponentText: string; StartPos: Integer; @@ -679,7 +679,7 @@ var // add new component to new selection NewSelection.Add(NewComponent); // set new nice bounds - if cpsfFindUniquePositions in Flags then + if cpsfFindUniquePositions in PasteFlags then FindUniquePosition(NewComponent); // finish adding component NotifyPersistentAdded(NewComponent); @@ -691,7 +691,7 @@ var begin Result:=false; - if (cpsfReplace in Flags) and (not DeleteSelection) then exit; + if (cpsfReplace in PasteFlags) and (not DeleteSelection) then exit; if PasteParent=nil then PasteParent:=GetPasteParent; NewSelection:=TControlSelection.Create; @@ -814,9 +814,9 @@ begin end; function TDesigner.PasteSelection( - Flags: TComponentPasteSelectionFlags): boolean; + PasteFlags: TComponentPasteSelectionFlags): boolean; begin - Result:=DoPasteSelectionFromClipboard(Flags); + Result:=DoPasteSelectionFromClipboard(PasteFlags); end; function TDesigner.DeleteSelection: boolean; diff --git a/ide/objectlists.pas b/ide/objectlists.pas index 3d2028d2ef..7f32a253a1 100644 --- a/ide/objectlists.pas +++ b/ide/objectlists.pas @@ -73,7 +73,7 @@ type procedure InsertObject(Index: Integer; Item, Associated: Pointer); function Last: Pointer; procedure Move(CurIndex, NewIndex: Integer); - procedure Assign(List: TList); + procedure Assign(SrcList: TList); function Remove(Item: Pointer): Integer; procedure Pack; property Capacity: Integer read FCapacity write SetCapacity; @@ -230,14 +230,14 @@ begin FList[NewIndex]:=SwapDummy; end; -procedure TObjectList.Assign(List: TList); +procedure TObjectList.Assign(SrcList: TList); var i: Integer; begin Clear; - Count:=List.Count; - for i:=0 to List.Count-1 do begin - FList[i].Item:=List[i]; + Count:=SrcList.Count; + for i:=0 to SrcList.Count-1 do begin + FList[i].Item:=SrcList[i]; FList[i].Associated:=nil; end; end; diff --git a/ideintf/actionseditor.pas b/ideintf/actionseditor.pas index 2958a149af..d76bf05212 100644 --- a/ideintf/actionseditor.pas +++ b/ideintf/actionseditor.pas @@ -107,7 +107,6 @@ type { Action Registration } -type TRegisteredAction = class private FActionClass: TBasicActionClass; @@ -784,6 +783,14 @@ begin Result:=FItems.Count; end; +procedure RegisterStandardActions; +begin + // TODO + // - db actions + // - edit actions + // - default images for actions +end; + initialization NotifyActionListChange:=nil; ActionListEditorForm:=nil; @@ -793,6 +800,8 @@ initialization EnumRegisteredActionsProc := @EnumActions; CreateActionProc := @CreateAction; RegisterComponentEditor(TActionList,TActionListComponentEditor); + RegisterStandardActions; + finalization RegisteredActions.Free; RegisteredActions:=nil;