diff --git a/designer/designer.pp b/designer/designer.pp index 79db38dd9f..299b477303 100644 --- a/designer/designer.pp +++ b/designer/designer.pp @@ -48,7 +48,7 @@ uses LazarusIDEStrConsts, EnvironmentOpts, IDECommands, ComponentReg, NonControlDesigner, FrameDesigner, AlignCompsDlg, SizeCompsDlg, ScaleCompsDlg, TabOrderDlg, DesignerProcs, CustomFormEditor, AskCompNameDlg, - ControlSelection, ChangeClassDialog, EditorOptions; + ControlSelection, ChangeClassDialog, EditorOptions, SynEditKeyCmds; type TDesigner = class; @@ -197,6 +197,8 @@ type procedure DoOrderMoveSelectionToBack; procedure DoOrderForwardSelectionOne; procedure DoOrderBackSelectionOne; + procedure DoUndo; + procedure DoRedo; procedure GiveComponentsNames; procedure NotifyPersistentAdded(APersistent: TPersistent); @@ -260,6 +262,7 @@ type MenuIndex: integer): boolean; override; procedure DoProcessCommand(Sender: TObject; var Command: word; var Handled: boolean); + function DoCommand(Command: word): boolean; function NonVisualComponentLeftTop(AComponent: TComponent): TPoint; function NonVisualComponentAtPos(X, Y: integer): TComponent; @@ -507,8 +510,7 @@ begin 'Custom dynamic section'); // register align section - DesignerMenuSectionAlign:=RegisterIDEMenuSection(DesignerMenuRoot, - 'Align section'); + DesignerMenuSectionAlign:=RegisterIDEMenuSection(DesignerMenuRoot, 'Align section'); DesignerMenuAlign:=RegisterIDEMenuCommand(DesignerMenuSectionAlign, 'Align',fdmAlignWord, nil, nil, nil, 'align'); DesignerMenuMirrorHorizontal:=RegisterIDEMenuCommand(DesignerMenuSectionAlign, @@ -521,8 +523,7 @@ begin 'Size',fdmSizeWord, nil, nil, nil, 'size'); // register tab and z-order section - DesignerMenuSectionOrder:=RegisterIDEMenuSection(DesignerMenuRoot, - 'Order section'); + DesignerMenuSectionOrder:=RegisterIDEMenuSection(DesignerMenuRoot, 'Order section'); DesignerMenuTabOrder:=RegisterIDEMenuCommand(DesignerMenuSectionOrder, 'Tab order',fdmTabOrder); DesignerMenuSectionZOrder:=RegisterIDESubMenu(DesignerMenuSectionOrder, @@ -537,8 +538,7 @@ begin 'Move z order backwards one',fdmOrderBackOne, nil, nil, nil, 'Order_back_one'); // register clipboard section - DesignerMenuSectionClipboard:=RegisterIDEMenuSection(DesignerMenuRoot, - 'Clipboard section'); + DesignerMenuSectionClipboard:=RegisterIDEMenuSection(DesignerMenuRoot, 'Clipboard section'); DesignerMenuCut:=RegisterIDEMenuCommand(DesignerMenuSectionClipboard, 'Cut',lisMenuCut, nil, nil, nil, 'laz_cut'); DesignerMenuCopy:=RegisterIDEMenuCommand(DesignerMenuSectionClipboard, @@ -551,8 +551,7 @@ begin 'Select All',fdmSelectAll, nil, nil, nil, 'menu_select_all'); // register miscellaneous section - DesignerMenuSectionMisc:=RegisterIDEMenuSection(DesignerMenuRoot, - 'Miscellaneous section'); + DesignerMenuSectionMisc:=RegisterIDEMenuSection(DesignerMenuRoot, 'Miscellaneous section'); DesignerMenuChangeClass:=RegisterIDEMenuCommand(DesignerMenuSectionMisc, 'Change class',lisChangeClass); DesignerMenuChangeParent:=RegisterIDEMenuSection(DesignerMenuSectionMisc, @@ -567,8 +566,7 @@ begin 'Center form', lisCenterForm); // register options section - DesignerMenuSectionOptions:=RegisterIDEMenuSection(DesignerMenuRoot, - 'Options section'); + DesignerMenuSectionOptions:=RegisterIDEMenuSection(DesignerMenuRoot, 'Options section'); DesignerMenuSnapToGridOption:=RegisterIDEMenuCommand(DesignerMenuSectionOptions, 'Snap to grid',fdmSnapToGridOption); DesignerMenuSnapToGuideLinesOption:=RegisterIDEMenuCommand(DesignerMenuSectionOptions, @@ -1322,6 +1320,16 @@ begin Modified; end; +procedure TDesigner.DoUndo; +begin + ; // ToDo: Implement Undo +end; + +procedure TDesigner.DoRedo; +begin + ; // ToDo: Implement Redo +end; + procedure TDesigner.GiveComponentsNames; var i: Integer; @@ -1411,28 +1419,32 @@ end; procedure TDesigner.DoProcessCommand(Sender: TObject; var Command: word; var Handled: boolean); begin - if Assigned(OnProcessCommand) and (Command <> ecNone) - then begin + if Assigned(OnProcessCommand) and (Command <> ecNone) then + begin OnProcessCommand(Self,Command,Handled); Handled := Handled or (Command = ecNone); end; + if not Handled then + Handled := DoCommand(Command); +end; - if Handled then Exit; - +function TDesigner.DoCommand(Command: word): boolean; +begin case Command of ecDesignerSelectParent : SelectParentOfSelection; - ecDesignerCopy : CopySelection; - ecDesignerCut : CutSelection; - ecDesignerPaste : PasteSelection([cpsfFindUniquePositions]); + ecUndo : DoUndo; + ecRedo : DoRedo; + ecCopy : CopySelection; + ecCut : CutSelection; + ecPaste : PasteSelection([cpsfFindUniquePositions]); ecDesignerMoveToFront : DoOrderMoveSelectionToFront; ecDesignerMoveToBack : DoOrderMoveSelectionToBack; ecDesignerForwardOne : DoOrderForwardSelectionOne; ecDesignerBackOne : DoOrderBackSelectionOne; else - Exit; + Exit(False); end; - - Handled := True; + Result := True; end; function TDesigner.NonVisualComponentLeftTop(AComponent: TComponent): TPoint; @@ -1677,9 +1689,7 @@ begin Result := True; Sender.Dispatch(TheMessage); if ControlSelection.SelectionForm = Form then - begin ControlSelection.CheckForLCLChanges(True); - end; end; function TDesigner.MoveControl(Sender: TControl; TheMessage: TLMMove): Boolean; @@ -1972,7 +1982,6 @@ var // modified Modified; - // set initial properties if NewComponent is TControl then begin TControl(NewComponent).Visible:=true; @@ -2359,8 +2368,7 @@ begin if Mediator<>nil then Mediator.KeyDown(Sender,TheMessage.CharCode,Shift); - Command := FTheFormEditor.TranslateKeyToDesignerCommand( - TheMessage.CharCode, Shift); + Command := FTheFormEditor.TranslateKeyToDesignerCommand(TheMessage.CharCode, Shift); //DebugLn(['TDesigner.KEYDOWN Command=',dbgs(Command),' ',TheMessage.CharCode,' ',dbgs(Shift)]); DoProcessCommand(Self, Command, Handled); //DebugLn(['TDesigner.KeyDown Command=',Command,' Handled=',Handled,' TheMessage.CharCode=',TheMessage.CharCode]); @@ -2444,8 +2452,7 @@ begin if (ControlSelection.LookupRootSelected) then begin if ControlSelection.Count>1 then MessageDlg(lisInvalidDelete, - lisTheRootComponentCanNotBeDeleted, mtInformation, - [mbOk],0); + lisTheRootComponentCanNotBeDeleted, mtInformation, [mbOk],0); exit; end; // check if a selected component is inherited (can not be deleted) @@ -2506,8 +2513,7 @@ begin Form.Invalidate; end; -procedure TDesigner.DoDeletePersistent(APersistent: TPersistent; - FreeIt: boolean); +procedure TDesigner.DoDeletePersistent(APersistent: TPersistent; FreeIt: boolean); var Hook: TPropertyEditorHook; begin @@ -2537,8 +2543,7 @@ begin // delete component if APersistent is TComponent then TheFormEditor.DeleteComponent(TComponent(APersistent),FreeIt) - else - if FreeIt then + else if FreeIt then APersistent.Free; // unmark component DeletingPersistent.Remove(APersistent); diff --git a/ide/keymapping.pp b/ide/keymapping.pp index 1f95b96b25..d154bcbb48 100644 --- a/ide/keymapping.pp +++ b/ide/keymapping.pp @@ -594,9 +594,6 @@ begin ecReportingBug: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]); // designer - ecDesignerCopy : SetResult(VK_C,[ssCtrl],VK_Insert,[ssCtrl]); - ecDesignerCut : SetResult(VK_X,[ssCtrl],VK_Delete,[ssShift]); - ecDesignerPaste : SetResult(VK_V,[ssCtrl],VK_Insert,[ssShift]); ecDesignerSelectParent: SetResult(VK_ESCAPE,[],VK_UNKNOWN,[]); ecDesignerMoveToFront : SetResult(VK_PRIOR,[ssShift],VK_UNKNOWN,[]); ecDesignerMoveToBack : SetResult(VK_NEXT,[ssShift],VK_UNKNOWN,[]); @@ -694,7 +691,7 @@ begin case Command of // moving - ecWordLeft:SetResult(VK_A, [ssCtrl], VK_UNKNOWN, [], VK_LEFT, [ssCtrl], VK_UNKNOWN,[]); + ecWordLeft: SetResult(VK_A, [ssCtrl], VK_UNKNOWN, [], VK_LEFT, [ssCtrl], VK_UNKNOWN,[]); ecWordRight: SetResult(VK_D, [ssCtrl], VK_UNKNOWN, [], VK_RIGHT, [ssCtrl],VK_UNKNOWN,[]); ecLineStart: SetResult(VK_Q, [ssCtrl], VK_S, [], VK_HOME, [],VK_UNKNOWN,[]); ecLineEnd: SetResult(VK_Q, [ssCtrl], VK_D, [], VK_END, [],VK_UNKNOWN,[]); @@ -1029,9 +1026,6 @@ begin ecReportingBug: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[]); // designer - ecDesignerCopy : SetResult(VK_C,[ssCtrl],VK_UNKNOWN,[],VK_Insert,[ssCtrl],VK_UNKNOWN,[]); - ecDesignerCut : SetResult(VK_X,[ssCtrl],VK_UNKNOWN,[],VK_Delete,[ssShift],VK_UNKNOWN,[]); - ecDesignerPaste : SetResult(VK_V,[ssCtrl],VK_UNKNOWN,[],VK_Insert,[ssShift],VK_UNKNOWN,[]); ecDesignerSelectParent: SetResult(VK_ESCAPE,[],VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[]); ecDesignerMoveToFront : SetResult(VK_PRIOR,[ssShift],VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[]); ecDesignerMoveToBack : SetResult(VK_NEXT,[ssShift],VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[]); @@ -1646,9 +1640,6 @@ begin ecReportingBug: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]); // designer - ecDesignerCopy : SetResult(VK_C,[ssMeta],VK_UNKNOWN,[]); - ecDesignerCut : SetResult(VK_X,[ssMeta],VK_UNKNOWN,[]); - ecDesignerPaste : SetResult(VK_V,[ssMeta],VK_UNKNOWN,[]); ecDesignerSelectParent: SetResult(VK_ESCAPE,[],VK_UNKNOWN,[]); ecDesignerMoveToFront : SetResult(VK_PRIOR,[ssShift],VK_UNKNOWN,[]); ecDesignerMoveToBack : SetResult(VK_NEXT,[ssShift],VK_UNKNOWN,[]); @@ -2178,9 +2169,6 @@ begin ecReportingBug : Result:= lisMenuReportingBug; // desginer - ecDesignerCopy : Result:= lisDsgCopyComponents; - ecDesignerCut : Result:= lisDsgCutComponents; - ecDesignerPaste : Result:= lisDsgPasteComponents; ecDesignerSelectParent : Result:= lisDsgSelectParentComponent; ecDesignerMoveToFront : Result:= lisDsgOrderMoveToFront; ecDesignerMoveToBack : Result:= lisDsgOrderMoveToBack; @@ -2398,8 +2386,7 @@ begin AddDefault(C, 'Move cursor left one page', srkmecPageLeft, ecPageLeft); AddDefault(C, 'Move cursor right one page', srkmecPageRight, ecPageRight); AddDefault(C, 'Move cursor to top of page', srkmecPageTop, ecPageTop); - AddDefault(C, 'Move cursor to bottom of page', srkmecPageBottom, ecPageBottom - ); + AddDefault(C, 'Move cursor to bottom of page', srkmecPageBottom, ecPageBottom); AddDefault(C, 'Move cursor to absolute beginning', srkmecEditorTop, ecEditorTop); AddDefault(C, 'Move cursor to absolute end', srkmecEditorBottom, @@ -2412,9 +2399,6 @@ begin // selection C:=Categories[AddCategory('Selection',srkmCatSelection, IDECmdScopeSrcEditOnly)]; - AddDefault(C, 'Copy selection to clipboard', srkmecCopy, ecCopy); - AddDefault(C, 'Cut selection to clipboard', srkmecCut, ecCut); - AddDefault(C, 'Paste clipboard to current position', srkmecPaste, ecPaste); AddDefault(C, 'Normal selection mode', srkmecNormalSelect, ecNormalSelect); AddDefault(C, 'Column selection mode', srkmecColumnSelect, ecColumnSelect); AddDefault(C, 'Line selection mode', srkmecLineSelect, ecLineSelect); @@ -2427,12 +2411,10 @@ begin AddDefault(C, 'Convert tabs to spaces in selection', srkmecSelectionTabs2Spaces, ecSelectionTabs2Spaces); AddDefault(C, 'Enclose selection', lisKMEncloseSelection, ecSelectionEnclose); - AddDefault(C, 'Comment selection', lisMenuCommentSelection, ecSelectionComment - ); + AddDefault(C, 'Comment selection', lisMenuCommentSelection, ecSelectionComment); AddDefault(C, 'Uncomment selection', lisMenuUncommentSelection, ecSelectionUncomment); - AddDefault(C, 'Toggle comment', lisMenuToggleComment, ecToggleComment - ); + AddDefault(C, 'Toggle comment', lisMenuToggleComment, ecToggleComment); AddDefault(C, 'Sort selection', lisSortSelSortSelection, ecSelectionSort); AddDefault(C, 'Break Lines in selection', lisMenuBeakLinesInSelection, ecSelectionBreakLines); @@ -2503,25 +2485,21 @@ begin AddDefault(C, 'Insert from Character Map', lisMenuInsertCharacter, ecInsertCharacter); AddDefault(C, 'Insert GPL notice', srkmecInsertGPLNotice, ecInsertGPLNotice); - AddDefault(C, 'Insert LGPL notice', srkmecInsertLGPLNotice, ecInsertLGPLNotice - ); + AddDefault(C, 'Insert LGPL notice', srkmecInsertLGPLNotice, ecInsertLGPLNotice); AddDefault(C, 'Insert modified LGPL notice', srkmecInsertModifiedLGPLNotice, ecInsertModifiedLGPLNotice); AddDefault(C, 'Insert username', lisKMInsertUsername, ecInsertUserName); - AddDefault(C, 'Insert date and time', lisKMInsertDateAndTime, ecInsertDateTime - ); + AddDefault(C, 'Insert date and time', lisKMInsertDateAndTime, ecInsertDateTime); AddDefault(C, 'Insert ChangeLog entry', srkmecInsertChangeLogEntry, ecInsertChangeLogEntry); AddDefault(C, 'Insert CVS keyword Author', srkmecInsertCVSAuthor, ecInsertCVSAuthor); - AddDefault(C, 'Insert CVS keyword Date', srkmecInsertCVSDate, ecInsertCVSDate - ); + AddDefault(C, 'Insert CVS keyword Date', srkmecInsertCVSDate, ecInsertCVSDate); AddDefault(C, 'Insert CVS keyword Header', srkmecInsertCVSHeader, ecInsertCVSHeader); AddDefault(C, 'Insert CVS keyword ID', srkmecInsertCVSID, ecInsertCVSID); AddDefault(C, 'Insert CVS keyword Log', srkmecInsertCVSLog, ecInsertCVSLog); - AddDefault(C, 'Insert CVS keyword Name', srkmecInsertCVSName, ecInsertCVSName - ); + AddDefault(C, 'Insert CVS keyword Name', srkmecInsertCVSName, ecInsertCVSName); AddDefault(C, 'Insert CVS keyword Revision', srkmecInsertCVSRevision, ecInsertCVSRevision); ; AddDefault(C, 'Insert CVS keyword Source', srkmecInsertCVSSource, @@ -2533,6 +2511,9 @@ begin C:=Categories[AddCategory('CommandCommands',srkmCatCmdCmd,nil)]; AddDefault(C, 'Undo', lisMenuUndo, ecUndo); AddDefault(C, 'Redo', lisMenuRedo, ecRedo); + AddDefault(C, 'Copy selection to clipboard', srkmecCopy, ecCopy); + AddDefault(C, 'Cut selection to clipboard', srkmecCut, ecCut); + AddDefault(C, 'Paste clipboard to current position', srkmecPaste, ecPaste); // search & replace C:=Categories[AddCategory('SearchReplace',srkmCatSearchReplace, @@ -2553,8 +2534,7 @@ begin AddDefault(C, 'Jump forward', lisMenuJumpForward, ecJumpForward); AddDefault(C, 'Add jump point', srkmecAddJumpPoint, ecAddJumpPoint); AddDefault(C, 'View jump history', lisKMViewJumpHistory, ecViewJumpHistory); - AddDefault(C, 'Jump to next error', lisMenuJumpToNextError, ecJumpToNextError - ); + AddDefault(C, 'Jump to next error', lisMenuJumpToNextError, ecJumpToNextError); AddDefault(C, 'Jump to previous error', lisMenuJumpToPrevError, ecJumpToPrevError); AddDefault(C, 'Open file at cursor', srkmecOpenFileAtCursor, @@ -2647,8 +2627,7 @@ begin ecRemoveEmptyMethods); AddDefault(C, 'Remove unused units', srkmecRemoveUnusedUnits, ecRemoveUnusedUnits); - AddDefault(C, 'Find overloads', srkmecFindOverloads, - ecFindOverloads); + AddDefault(C, 'Find overloads', srkmecFindOverloads, ecFindOverloads); // Template editing C:=Categories[AddCategory('Edit Template', srkmCatTemplateEdit, IDECmdScopeSrcEditOnlyTmplEdit)]; @@ -2716,8 +2695,7 @@ begin AddDefault(C, 'Go to next editor', srkmecNextEditor, ecNextEditor); AddDefault(C, 'Go to prior editor', srkmecPrevEditor, ecPrevEditor); AddDefault(C, 'Add break point', srkmecToggleBreakPoint, ecToggleBreakPoint); - AddDefault(C, 'Remove break point', srkmecRemoveBreakPoint, ecRemoveBreakPoint - ); + AddDefault(C, 'Remove break point', srkmecRemoveBreakPoint, ecRemoveBreakPoint); AddDefault(C, 'Move editor left', srkmecMoveEditorLeft, ecMoveEditorLeft); AddDefault(C, 'Move editor right', srkmecMoveEditorRight, ecMoveEditorRight); AddDefault(C, 'Move editor leftmost', srkmecMoveEditorLeftmost, ecMoveEditorLeftmost); @@ -2813,8 +2791,7 @@ begin AddDefault(C, 'Save project', lisKMSaveProject, ecSaveProject); AddDefault(C, 'Save project as', lisKMSaveProjectAs, ecSaveProjectAs); AddDefault(C, 'Publish project', lisKMPublishProject, ecPublishProject); - AddDefault(C, 'Project Inspector', lisMenuProjectInspector, ecProjectInspector - ); + AddDefault(C, 'Project Inspector', lisMenuProjectInspector, ecProjectInspector); AddDefault(C, 'Add active unit to project', lisKMAddActiveUnitToProject, ecAddCurUnitToProj); AddDefault(C, 'Remove active unit from project', @@ -2909,12 +2886,6 @@ begin // designer - without menu items in the IDE bar (at least not directly) C:=Categories[AddCategory('Designer',lisKeyCatDesigner,IDECmdScopeDesignerOnly)]; - AddDefault(C, 'Copy selected Components to clipboard', - lisKMCopySelectedComponentsToClipboard, ecDesignerCopy); - AddDefault(C, 'Cut selected Components to clipboard', - lisKMCutSelectedComponentsToClipboard, ecDesignerCut); - AddDefault(C, 'Paste Components from clipboard', - lisKMPasteComponentsFromClipboard, ecDesignerPaste); AddDefault(C, 'Select parent component', lisDsgSelectParentComponent, ecDesignerSelectParent); AddDefault(C, 'Move component to front', lisDsgOrderMoveToFront, @@ -2923,8 +2894,8 @@ begin ecDesignerMoveToBack); AddDefault(C, 'Move component one forward', lisDsgOrderForwardOne, ecDesignerForwardOne); - AddDefault(C, 'Move component one back', lisDsgOrderBackOne, ecDesignerBackOne - ); + AddDefault(C, 'Move component one back', lisDsgOrderBackOne, + ecDesignerBackOne); // object inspector - without menu items in the IDE bar (at least no direct) C:=Categories[AddCategory('Object Inspector',lisKeyCatObjInspector, diff --git a/ide/main.pp b/ide/main.pp index 757237c543..ff2c1eb823 100644 --- a/ide/main.pp +++ b/ide/main.pp @@ -846,7 +846,7 @@ type function QuitIDE: boolean; // edit menu - procedure DoCommand(EditorCommand: integer); override; + procedure DoCommand(ACommand: integer); override; procedure DoSourceEditorCommand(EditorCommand: integer); procedure UpdateCustomToolsInMenu; @@ -16381,27 +16381,27 @@ end; procedure TMainIDE.mnuEditCopyClicked(Sender: TObject); begin - DoSourceEditorCommand(ecCopy); + DoCommand(ecCopy); end; procedure TMainIDE.mnuEditCutClicked(Sender: TObject); begin - DoSourceEditorCommand(ecCut); + DoCommand(ecCut); end; procedure TMainIDE.mnuEditPasteClicked(Sender: TObject); begin - DoSourceEditorCommand(ecPaste); + DoCommand(ecPaste); end; procedure TMainIDE.mnuEditRedoClicked(Sender: TObject); begin - DoSourceEditorCommand(ecRedo); + DoCommand(ecRedo); end; procedure TMainIDE.mnuEditUndoClicked(Sender: TObject); begin - DoSourceEditorCommand(ecUndo); + DoCommand(ecUndo); end; procedure TMainIDE.mnuEditIndentBlockClicked(Sender: TObject); @@ -16599,22 +16599,19 @@ begin DoSourceEditorCommand(ecInsertCVSSource); end; -procedure TMainIDE.DoCommand(EditorCommand: integer); +procedure TMainIDE.DoCommand(ACommand: integer); var ActiveSourceEditor: TSourceEditor; ActiveUnitInfo: TUnitInfo; begin GetCurrentUnit(ActiveSourceEditor,ActiveUnitInfo); - if FDisplayState = dsSource then begin - // send command to source editor - if (ActiveSourceEditor=nil) then exit; - ActiveSourceEditor.DoEditorExecuteCommand(EditorCommand); - end else begin - // send command to form editor - if ActiveUnitInfo=nil then exit; - - // ToDo: send command to form editor/designer - + case FDisplayState of + dsSource: // send command to source editor + if Assigned(ActiveSourceEditor) then + ActiveSourceEditor.DoEditorExecuteCommand(ACommand); + dsForm: // send command to form editor + if Assigned(ActiveUnitInfo) then + TDesigner(GetDesignerFormOfSource(ActiveUnitInfo,False).Designer).DoCommand(ACommand); end; end; @@ -16628,8 +16625,7 @@ begin CurFocusControl:=GetParentForm(CurFocusControl); if (CurFocusControl<>MainIDEBar) and not(CurFocusControl is TSourceNotebook) then begin - // continue processing shortcut, not handled yet - MainIDEBar.mnuMainMenu.ShortcutHandled := false; +// MainIDEBar.mnuMainMenu.ShortcutHandled := false; // Shortcut not handled yet exit; end; end; diff --git a/ide/mainintf.pas b/ide/mainintf.pas index 6b3afc9f4a..51f7fc2760 100644 --- a/ide/mainintf.pas +++ b/ide/mainintf.pas @@ -149,7 +149,7 @@ type out ActiveSourceEditor: TSourceEditorInterface; out ActiveUnitInfo: TUnitInfo); virtual; abstract; - procedure DoCommand(EditorCommand: integer); virtual; abstract; + procedure DoCommand(ACommand: integer); virtual; abstract; procedure GetIDEFileState(Sender: TObject; const AFilename: string; NeededFlags: TIDEFileStateFlags; diff --git a/ideintf/idecommands.pas b/ideintf/idecommands.pas index 762c445974..0be8a6f7d6 100644 --- a/ideintf/idecommands.pas +++ b/ideintf/idecommands.pas @@ -296,9 +296,6 @@ const ecReportingBug = ecFirstLazarus + 905; // designer - ecDesignerCopy = ecFirstLazarus + 1000; - ecDesignerCut = ecFirstLazarus + 1001; - ecDesignerPaste = ecFirstLazarus + 1002; ecDesignerSelectParent = ecFirstLazarus + 1003; ecDesignerMoveToFront = ecFirstLazarus + 1004; ecDesignerMoveToBack = ecFirstLazarus + 1005;