paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-06-01 03:13:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Reserve "On..." prefix for events and name functions differently.

Browse Source
This commit is contained in:
Juha 2023-07-24 20:18:01 +03:00
parent 64391dbd96
commit cc4760393b
30 changed files with 416 additions and 415 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/codetools/codecompletiontool.pas
View File

@ -161,7 +161,7 @@ type
FJumpToProcHead: TPascalMethodHeader;
NewClassSectionIndent: array[TPascalClassSection] of integer;
NewClassSectionInsertPos: array[TPascalClassSection] of integer;
fFullTopLvlName: string;// used by OnTopLvlIdentifierFound
fFullTopLvlName: string;// used by TopLvlIdentifierFound
fNewMainUsesSectionUnits: TAVLTree; // tree of AnsiString
procedure AddNewPropertyAccessMethodsToClassProcs(ClassProcs: TAVLTree;
const TheClassName: string);
@ -186,7 +186,7 @@ type
function GetFirstClassIdentifier(ClassNode: TCodeTreeNode): TCodeTreeNode;
procedure SetCodeCompleteClassNode(const AClassNode: TCodeTreeNode);
procedure SetCodeCompleteSrcChgCache(const AValue: TSourceChangeCache);
function OnTopLvlIdentifierFound(Params: TFindDeclarationParams;
function TopLvlIdentifierFound(Params: TFindDeclarationParams;
const FoundContext: TFindContext): TIdentifierFoundResult;
procedure RemoveNewMainUsesSectionUnit(p: PChar);
protected
@ -592,7 +592,7 @@ begin
FSetPropertyVariableUseConst := aValue;
end;
function TCodeCompletionCodeTool.OnTopLvlIdentifierFound(
function TCodeCompletionCodeTool.TopLvlIdentifierFound(
Params: TFindDeclarationParams; const FoundContext: TFindContext
): TIdentifierFoundResult;
var
@ -2083,7 +2083,7 @@ function TCodeCompletionCodeTool.CompleteEventAssignment(CleanCursorPos,
MoveCursorToCleanPos(PropVarAtom.StartPos);
Params.SetIdentifier(Self,@Src[CurPos.StartPos],nil);
fFullTopLvlName:='';
Params.OnTopLvlIdentifierFound:=@OnTopLvlIdentifierFound;
Params.OnTopLvlIdentifierFound:=@TopLvlIdentifierFound;
Params.Flags:=[fdfSearchInParentNodes,fdfSearchInAncestors,fdfSearchInHelpers,
fdfTopLvlResolving,fdfFindVariable];
if (not FindDeclarationOfIdentAtParam(Params)) then begin

16
components/ideintf/objectinspector.pp
View File

@ -421,7 +421,7 @@ type
ARect: TRect; State: TOwnerDrawState);
procedure OnIdle(Sender: TObject; var {%H-}Done: Boolean);
procedure SetIdleEvent(Enable: boolean);
procedure OnGridMouseWheel(Sender: TObject; {%H-}Shift: TShiftState;
procedure GridMouseWheel(Sender: TObject; {%H-}Shift: TShiftState;
WheelDelta: Integer; {%H-}MousePos: TPoint; var Handled: Boolean);
procedure WMVScroll(var Msg: TLMScroll); message LM_VSCROLL;
@ -1075,7 +1075,7 @@ begin
OnKeyDown:=@ValueEditKeyDown;
OnKeyUp:=@ValueEditKeyUp;
OnMouseUp:=@ValueEditMouseUp;
OnMouseWheel:=@OnGridMouseWheel;
OnMouseWheel:=@GridMouseWheel;
end;
ValueComboBox:=TComboBox.Create(Self);
@ -1105,7 +1105,7 @@ begin
OnCloseUp:=@ValueComboBoxCloseUp;
OnMeasureItem:=@ValueComboBoxMeasureItem;
OnDrawItem:=@ValueComboBoxDrawItem;
OnMouseWheel:=@OnGridMouseWheel;
OnMouseWheel:=@GridMouseWheel;
end;
ValueCheckBox:={$IFnDEF UseOINormalCheckBox} TCheckBoxThemed.Create(Self); {$ELSE} TCheckBox.Create(Self); {$ENDIF}
@ -1127,7 +1127,7 @@ begin
OnKeyDown:=@ValueCheckBoxKeyDown;
OnKeyUp:=@ValueCheckBoxKeyUp;
OnClick:=@ValueCheckBoxClick;
OnMouseWheel:=@OnGridMouseWheel;
OnMouseWheel:=@GridMouseWheel;
end;
ValueButton:=TSpeedButton.Create(Self);
@ -1141,7 +1141,7 @@ begin
Caption := '...';
SetBounds(0,-30,Width,Height); // hidden
Parent:=Self;
OnMouseWheel:=@OnGridMouseWheel;
OnMouseWheel:=@GridMouseWheel;
end;
FHintManager := THintWindowManager.Create;
@ -1313,11 +1313,11 @@ var
H: Boolean;
begin
H := False;
OnGridMouseWheel(Self, Shift, WheelDelta, MousePos, H);
GridMouseWheel(Self, Shift, WheelDelta, MousePos, H);
Result:=true;
end;
procedure TOICustomPropertyGrid.OnGridMouseWheel(Sender: TObject; Shift: TShiftState;
procedure TOICustomPropertyGrid.GridMouseWheel(Sender: TObject; Shift: TShiftState;
WheelDelta: Integer; MousePos: TPoint; var Handled: Boolean);
begin
if Mouse.WheelScrollLines=-1 then
@ -5586,7 +5586,7 @@ procedure TObjectInspectorDlg.CreateNoteBook;
OnOIKeyDown := @GridKeyDown;
OnKeyUp := @GridKeyUp;
OnDblClick := @GridDblClick;
OnMouseWheel := @OnGridMouseWheel;
OnMouseWheel := @GridMouseWheel;
Parent := NoteBook.Page[ANotebookPage];
end;

27
components/ideintf/propedits.pp
View File

@ -1699,10 +1699,11 @@ type
procedure SetKey(const AValue: Word);
procedure SetShiftButtons(const AValue: TShiftState);
procedure SetShiftState(const AValue: TShiftState);
procedure OnGrabButtonClick(Sender: TObject);
procedure OnShiftCheckBoxClick(Sender: TObject);
procedure OnGrabFormKeyDown(Sender: TObject; var AKey: Word; AShift: TShiftState);
procedure OnKeyComboboxEditingDone(Sender: TObject);
// Event handlers
procedure GrabButtonClick(Sender: TObject);
procedure ShiftCheckBoxClick(Sender: TObject);
procedure GrabFormKeyDown(Sender: TObject; var AKey: Word; AShift: TShiftState);
procedure KeyComboboxEditingDone(Sender: TObject);
protected
procedure Loaded; override;
procedure RealSetText(const {%H-}Value: TCaption); override;
@ -7928,13 +7929,13 @@ begin
KeyComboBox.ItemIndex:=0;
end;
procedure TCustomShortCutGrabBox.OnGrabButtonClick(Sender: TObject);
procedure TCustomShortCutGrabBox.GrabButtonClick(Sender: TObject);
begin
FGrabForm:=TForm.Create(Self);
FGrabForm.BorderStyle:=bsDialog;
FGrabForm.KeyPreview:=true;
FGrabForm.Position:=poScreenCenter;
FGrabForm.OnKeyDown:=@OnGrabFormKeyDown;
FGrabForm.OnKeyDown:=@GrabFormKeyDown;
FGrabForm.Caption:=oisPressAKey;
with TLabel.Create(Self) do begin
Caption:=oisPressAKeyEGCtrlP;
@ -7951,7 +7952,7 @@ begin
FreeAndNil(FGrabForm);
end;
procedure TCustomShortCutGrabBox.OnShiftCheckBoxClick(Sender: TObject);
procedure TCustomShortCutGrabBox.ShiftCheckBoxClick(Sender: TObject);
var
s: TShiftStateEnum;
begin
@ -7963,11 +7964,11 @@ begin
Exclude(FShiftState,s);
end;
procedure TCustomShortCutGrabBox.OnGrabFormKeyDown(Sender: TObject;
procedure TCustomShortCutGrabBox.GrabFormKeyDown(Sender: TObject;
var AKey: Word; AShift: TShiftState);
begin
{$IFDEF VerboseKeyboard}
DebugLn(['TCustomShortCutGrabBox.OnGrabFormKeyDown ',AKey,' ',dbgs(AShift)]);
DebugLn(['TCustomShortCutGrabBox.GrabFormKeyDown ',AKey,' ',dbgs(AShift)]);
DumpStack;
{$ENDIF}
if not (AKey in [VK_CONTROL, VK_LCONTROL, VK_RCONTROL,
@ -7989,7 +7990,7 @@ begin
end;
end;
procedure TCustomShortCutGrabBox.OnKeyComboboxEditingDone(Sender: TObject);
procedure TCustomShortCutGrabBox.KeyComboboxEditingDone(Sender: TObject);
begin
Key:=KeyStringToVKCode(KeyComboBox.Text);
end;
@ -8067,7 +8068,7 @@ begin
AnchorParallel(akTop,0,Self);
AnchorParallel(akBottom,0,Self);
Parent:=Self;
OnClick:=@OnShiftCheckBoxClick;
OnClick:=@ShiftCheckBoxClick;
end;
end;
LastCheckBox:=FCheckBoxes[s];
@ -8154,7 +8155,7 @@ begin
Align:=alRight;
AutoSize:=true;
Parent:=Self;
OnClick:=@OnGrabButtonClick;
OnClick:=@GrabButtonClick;
end;
FKeyComboBox:=TComboBox.Create(Self);
@ -8168,7 +8169,7 @@ begin
for i:=VK_BROWSER_BACK to VK_OEM_CLEAR do
AddKeyToCombobox(i);
Items.EndUpdate;
OnEditingDone:=@OnKeyComboboxEditingDone;
OnEditingDone:=@KeyComboboxEditingDone;
Parent:=Self;
AnchorToNeighbour(akRight,6,FGrabButton);
AnchorVerticalCenterTo(FGrabButton);

162
designer/designer.pp
View File

@ -238,33 +238,33 @@ type
// popup menu
procedure BuildPopupMenu;
procedure DesignerPopupMenuPopup(Sender: TObject);
procedure OnComponentEditorVerbMenuItemClick(Sender: TObject);
procedure OnAlignPopupMenuClick(Sender: TObject);
procedure OnMirrorHorizontalPopupMenuClick(Sender: TObject);
procedure OnMirrorVerticalPopupMenuClick(Sender: TObject);
procedure OnScalePopupMenuClick(Sender: TObject);
procedure OnSizePopupMenuClick(Sender: TObject);
procedure OnResetPopupMenuClick(Sender: TObject);
procedure OnAnchorEditorMenuClick(Sender: TObject);
procedure OnTabOrderMenuClick(Sender: TObject);
procedure OnOrderMoveToFrontMenuClick(Sender: TObject);
procedure OnOrderMoveToBackMenuClick(Sender: TObject);
procedure OnOrderForwardOneMenuClick(Sender: TObject);
procedure OnOrderBackOneMenuClick(Sender: TObject);
procedure OnCopyMenuClick(Sender: TObject);
procedure OnCutMenuClick(Sender: TObject);
procedure OnPasteMenuClick(Sender: TObject);
procedure OnDeleteSelectionMenuClick(Sender: TObject);
procedure OnSelectAllMenuClick(Sender: TObject);
procedure OnChangeClassMenuClick(Sender: TObject);
procedure OnChangeParentMenuClick(Sender: TObject);
procedure OnShowNonVisualComponentsMenuClick(Sender: TObject);
procedure OnSnapToGridOptionMenuClick(Sender: TObject);
procedure OnShowOptionsMenuItemClick(Sender: TObject);
procedure OnSnapToGuideLinesOptionMenuClick(Sender: TObject);
procedure OnViewLFMMenuClick(Sender: TObject);
procedure OnSaveAsXMLMenuClick(Sender: TObject);
procedure OnCenterFormMenuClick(Sender: TObject);
procedure ComponentEditorVerbMenuItemClick(Sender: TObject);
procedure AlignPopupMenuClick(Sender: TObject);
procedure MirrorHorizontalPopupMenuClick(Sender: TObject);
procedure MirrorVerticalPopupMenuClick(Sender: TObject);
procedure ScalePopupMenuClick(Sender: TObject);
procedure SizePopupMenuClick(Sender: TObject);
procedure ResetPopupMenuClick(Sender: TObject);
procedure AnchorEditorMenuClick(Sender: TObject);
procedure TabOrderMenuClick(Sender: TObject);
procedure OrderMoveToFrontMenuClick(Sender: TObject);
procedure OrderMoveToBackMenuClick(Sender: TObject);
procedure OrderForwardOneMenuClick(Sender: TObject);
procedure OrderBackOneMenuClick(Sender: TObject);
procedure CopyMenuClick(Sender: TObject);
procedure CutMenuClick(Sender: TObject);
procedure PasteMenuClick(Sender: TObject);
procedure DeleteSelectionMenuClick(Sender: TObject);
procedure SelectAllMenuClick(Sender: TObject);
procedure ChangeClassMenuClick(Sender: TObject);
procedure ChangeParentMenuClick(Sender: TObject);
procedure ShowNonVisualComponentsMenuClick(Sender: TObject);
procedure SnapToGridOptionMenuClick(Sender: TObject);
procedure ShowOptionsMenuItemClick(Sender: TObject);
procedure SnapToGuideLinesOptionMenuClick(Sender: TObject);
procedure ViewLFMMenuClick(Sender: TObject);
procedure SaveAsXMLMenuClick(Sender: TObject);
procedure CenterFormMenuClick(Sender: TObject);
// hook
function GetPropertyEditorHook: TPropertyEditorHook; override;
@ -3290,7 +3290,7 @@ begin
Result:=TheFormEditor.CreateUniqueComponentName(AClassName,FLookupRoot);
end;
procedure TDesigner.OnComponentEditorVerbMenuItemClick(Sender: TObject);
procedure TDesigner.ComponentEditorVerbMenuItemClick(Sender: TObject);
var
Verb: integer;
VerbCaption: string;
@ -3323,58 +3323,58 @@ begin
end;
end;
procedure TDesigner.OnDeleteSelectionMenuClick(Sender: TObject);
procedure TDesigner.DeleteSelectionMenuClick(Sender: TObject);
begin
Application.QueueAsyncCall(@DoDeleteSelectedPersistentsAsync, 0);
end;
procedure TDesigner.OnSelectAllMenuClick(Sender: TObject);
procedure TDesigner.SelectAllMenuClick(Sender: TObject);
begin
DoSelectAll;
end;
procedure TDesigner.OnChangeClassMenuClick(Sender: TObject);
procedure TDesigner.ChangeClassMenuClick(Sender: TObject);
begin
ChangeClass;
end;
procedure TDesigner.OnChangeParentMenuClick(Sender: TObject);
procedure TDesigner.ChangeParentMenuClick(Sender: TObject);
begin
if Assigned(OnChangeParent) then
OnChangeParent(Self);
end;
procedure TDesigner.OnShowNonVisualComponentsMenuClick(Sender: TObject);
procedure TDesigner.ShowNonVisualComponentsMenuClick(Sender: TObject);
begin
ShowNonVisualComponents:=not ShowNonVisualComponents;
end;
procedure TDesigner.OnSnapToGridOptionMenuClick(Sender: TObject);
procedure TDesigner.SnapToGridOptionMenuClick(Sender: TObject);
begin
EnvironmentGuiOpts.SnapToGrid := not EnvironmentGuiOpts.SnapToGrid;
end;
procedure TDesigner.OnShowOptionsMenuItemClick(Sender: TObject);
procedure TDesigner.ShowOptionsMenuItemClick(Sender: TObject);
begin
if Assigned(OnShowOptions) then OnShowOptions(Self);
end;
procedure TDesigner.OnSnapToGuideLinesOptionMenuClick(Sender: TObject);
procedure TDesigner.SnapToGuideLinesOptionMenuClick(Sender: TObject);
begin
EnvironmentGuiOpts.SnapToGuideLines := not EnvironmentGuiOpts.SnapToGuideLines;
end;
procedure TDesigner.OnViewLFMMenuClick(Sender: TObject);
procedure TDesigner.ViewLFMMenuClick(Sender: TObject);
begin
if Assigned(OnViewLFM) then OnViewLFM(Self);
end;
procedure TDesigner.OnSaveAsXMLMenuClick(Sender: TObject);
procedure TDesigner.SaveAsXMLMenuClick(Sender: TObject);
begin
if Assigned(OnSaveAsXML) then OnSaveAsXML(Self);
end;
procedure TDesigner.OnCenterFormMenuClick(Sender: TObject);
procedure TDesigner.CenterFormMenuClick(Sender: TObject);
var
NewLeft: Integer;
NewTop: Integer;
@ -3387,27 +3387,27 @@ begin
IDETabMaster.ShowForm(Form);
end;
procedure TDesigner.OnCopyMenuClick(Sender: TObject);
procedure TDesigner.CopyMenuClick(Sender: TObject);
begin
CopySelection;
end;
procedure TDesigner.OnCutMenuClick(Sender: TObject);
procedure TDesigner.CutMenuClick(Sender: TObject);
begin
Application.QueueAsyncCall(@CutSelectionAsync, 0);
end;
procedure TDesigner.OnPasteMenuClick(Sender: TObject);
procedure TDesigner.PasteMenuClick(Sender: TObject);
begin
PasteSelection([cpsfFindUniquePositions]);
end;
procedure TDesigner.OnAnchorEditorMenuClick(Sender: TObject);
procedure TDesigner.AnchorEditorMenuClick(Sender: TObject);
begin
DoShowAnchorEditor;
end;
procedure TDesigner.OnTabOrderMenuClick(Sender: TObject);
procedure TDesigner.TabOrderMenuClick(Sender: TObject);
begin
DoShowTabOrderEditor;
end;
@ -3812,7 +3812,7 @@ begin
NewMenuCmd:=RegisterIDEMenuCommand(DesignerMenuSectionComponentEditor,
'ComponentEditorVerMenuItem' + IntToStr(i),
AComponentEditor.GetVerb(i),
@OnComponentEditorVerbMenuItemClick);
@ComponentEditorVerbMenuItemClick);
if NewMenuCmd.MenuItem<>nil then
AComponentEditor.PrepareItem(i, NewMenuCmd.MenuItem);
end;
@ -3950,47 +3950,47 @@ begin
{$ENDIF}
DesignerMenuRoot.MenuItem := FDesignerPopupMenu.Items;
DesignerMenuAlign.OnClick := @OnAlignPopupMenuClick;
DesignerMenuMirrorHorizontal.OnClick := @OnMirrorHorizontalPopupMenuClick;
DesignerMenuMirrorVertical.OnClick := @OnMirrorVerticalPopupMenuClick;
DesignerMenuScale.OnClick := @OnScalePopupMenuClick;
DesignerMenuSize.OnClick := @OnSizePopupMenuClick;
DesignerMenuReset.OnClick := @OnResetPopupMenuClick;
DesignerMenuAlign.OnClick := @AlignPopupMenuClick;
DesignerMenuMirrorHorizontal.OnClick := @MirrorHorizontalPopupMenuClick;
DesignerMenuMirrorVertical.OnClick := @MirrorVerticalPopupMenuClick;
DesignerMenuScale.OnClick := @ScalePopupMenuClick;
DesignerMenuSize.OnClick := @SizePopupMenuClick;
DesignerMenuReset.OnClick := @ResetPopupMenuClick;
DesignerMenuAnchorEditor.OnClick:=@OnAnchorEditorMenuClick;
DesignerMenuTabOrder.OnClick:=@OnTabOrderMenuClick;
DesignerMenuOrderMoveToFront.OnClick := @OnOrderMoveToFrontMenuClick;
DesignerMenuAnchorEditor.OnClick:=@AnchorEditorMenuClick;
DesignerMenuTabOrder.OnClick:=@TabOrderMenuClick;
DesignerMenuOrderMoveToFront.OnClick := @OrderMoveToFrontMenuClick;
DesignerMenuOrderMoveToFront.MenuItem.ShortCut :=
EditorOpts.KeyMap.CommandToShortCut(ecDesignerMoveToFront);
DesignerMenuOrderMoveToBack.OnClick := @OnOrderMoveToBackMenuClick;
DesignerMenuOrderMoveToBack.OnClick := @OrderMoveToBackMenuClick;
DesignerMenuOrderMoveToBack.MenuItem.ShortCut :=
EditorOpts.KeyMap.CommandToShortCut(ecDesignerMoveToBack);
DesignerMenuOrderForwardOne.OnClick := @OnOrderForwardOneMenuClick;
DesignerMenuOrderForwardOne.OnClick := @OrderForwardOneMenuClick;
DesignerMenuOrderForwardOne.MenuItem.ShortCut :=
EditorOpts.KeyMap.CommandToShortCut(ecDesignerForwardOne);
DesignerMenuOrderBackOne.OnClick := @OnOrderBackOneMenuClick;
DesignerMenuOrderBackOne.OnClick := @OrderBackOneMenuClick;
DesignerMenuOrderBackOne.MenuItem.ShortCut :=
EditorOpts.KeyMap.CommandToShortCut(ecDesignerBackOne);
DesignerMenuCut.OnClick:=@OnCutMenuClick;
DesignerMenuCopy.OnClick:=@OnCopyMenuClick;
DesignerMenuPaste.OnClick:=@OnPasteMenuClick;
DesignerMenuDeleteSelection.OnClick:=@OnDeleteSelectionMenuClick;
DesignerMenuSelectAll.OnClick:=@OnSelectAllMenuClick;
DesignerMenuCut.OnClick:=@CutMenuClick;
DesignerMenuCopy.OnClick:=@CopyMenuClick;
DesignerMenuPaste.OnClick:=@PasteMenuClick;
DesignerMenuDeleteSelection.OnClick:=@DeleteSelectionMenuClick;
DesignerMenuSelectAll.OnClick:=@SelectAllMenuClick;
DesignerMenuChangeClass.OnClick:=@OnChangeClassMenuClick;
DesignerMenuChangeParent.OnClick:=@OnChangeParentMenuClick;
DesignerMenuViewLFM.OnClick:=@OnViewLFMMenuClick;
DesignerMenuSaveAsXML.OnClick:=@OnSaveAsXMLMenuClick;
DesignerMenuCenterForm.OnClick:=@OnCenterFormMenuClick;
DesignerMenuChangeClass.OnClick:=@ChangeClassMenuClick;
DesignerMenuChangeParent.OnClick:=@ChangeParentMenuClick;
DesignerMenuViewLFM.OnClick:=@ViewLFMMenuClick;
DesignerMenuSaveAsXML.OnClick:=@SaveAsXMLMenuClick;
DesignerMenuCenterForm.OnClick:=@CenterFormMenuClick;
DesignerMenuShowNonVisualComponents.OnClick:=@OnShowNonVisualComponentsMenuClick;
DesignerMenuShowNonVisualComponents.OnClick:=@ShowNonVisualComponentsMenuClick;
DesignerMenuShowNonVisualComponents.ShowAlwaysCheckable:=true;
DesignerMenuSnapToGridOption.OnClick:=@OnSnapToGridOptionMenuClick;
DesignerMenuSnapToGridOption.OnClick:=@SnapToGridOptionMenuClick;
DesignerMenuSnapToGridOption.ShowAlwaysCheckable:=true;
DesignerMenuSnapToGuideLinesOption.OnClick:=@OnSnapToGuideLinesOptionMenuClick;
DesignerMenuSnapToGuideLinesOption.OnClick:=@SnapToGuideLinesOptionMenuClick;
DesignerMenuSnapToGuideLinesOption.ShowAlwaysCheckable:=true;
DesignerMenuShowOptions.OnClick:=@OnShowOptionsMenuItemClick;
DesignerMenuShowOptions.OnClick:=@ShowOptionsMenuItemClick;
end;
procedure TDesigner.DesignerPopupMenuPopup(Sender: TObject);
@ -4078,7 +4078,7 @@ begin
DesignerMenuSnapToGuideLinesOption.Checked := EnvironmentGuiOpts.SnapToGuideLines;
end;
procedure TDesigner.OnAlignPopupMenuClick(Sender: TObject);
procedure TDesigner.AlignPopupMenuClick(Sender: TObject);
var
HorizAlignment, VertAlignment: TComponentAlignment;
HorizAlignID, VertAlignID: integer;
@ -4110,19 +4110,19 @@ begin
end;
end;
procedure TDesigner.OnMirrorHorizontalPopupMenuClick(Sender: TObject);
procedure TDesigner.MirrorHorizontalPopupMenuClick(Sender: TObject);
begin
Selection.MirrorHorizontal;
Modified;
end;
procedure TDesigner.OnMirrorVerticalPopupMenuClick(Sender: TObject);
procedure TDesigner.MirrorVerticalPopupMenuClick(Sender: TObject);
begin
Selection.MirrorVertical;
Modified;
end;
procedure TDesigner.OnScalePopupMenuClick(Sender: TObject);
procedure TDesigner.ScalePopupMenuClick(Sender: TObject);
var
ScaleInPercent: integer;
begin
@ -4133,7 +4133,7 @@ begin
end;
end;
procedure TDesigner.OnSizePopupMenuClick(Sender: TObject);
procedure TDesigner.SizePopupMenuClick(Sender: TObject);
var
HorizSizing, VertSizing: TComponentSizing;
HorizSizingID, VertSizingID: integer;
@ -4158,7 +4158,7 @@ begin
end;
end;
procedure TDesigner.OnResetPopupMenuClick(Sender: TObject);
procedure TDesigner.ResetPopupMenuClick(Sender: TObject);
var
ResetComps: TFPList;
HasChanged: Boolean;
@ -4228,22 +4228,22 @@ begin
end;
end;
procedure TDesigner.OnOrderMoveToFrontMenuClick(Sender: TObject);
procedure TDesigner.OrderMoveToFrontMenuClick(Sender: TObject);
begin
DoChangeZOrder(0);
end;
procedure TDesigner.OnOrderMoveToBackMenuClick(Sender: TObject);
procedure TDesigner.OrderMoveToBackMenuClick(Sender: TObject);
begin
DoChangeZOrder(1);
end;
procedure TDesigner.OnOrderForwardOneMenuClick(Sender: TObject);
procedure TDesigner.OrderForwardOneMenuClick(Sender: TObject);
begin
DoChangeZOrder(2);
end;
procedure TDesigner.OnOrderBackOneMenuClick(Sender: TObject);
procedure TDesigner.OrderBackOneMenuClick(Sender: TObject);
begin
DoChangeZOrder(3);
end;

6
designer/menushortcuts.pas
View File

@ -134,7 +134,7 @@ type
FOldShortcut: TShortCut;
FShortCutGrabBox: TShortCutGrabBox;
procedure OKButtonClick(Sender: TObject);
procedure OnGrabBoxCloseUp(Sender: TObject);
procedure GrabBoxCloseUp(Sender: TObject);
public
constructor CreateWithMenuItem(AOwner: TComponent; aMI: TMenuItem; isMainSC: boolean; aSC: TShortCut);
property NewShortcut: TShortCut read FNewShortcut;
@ -771,7 +771,7 @@ begin
{$if defined(darwin) or defined(macos) or defined(iphonesim)}
FShortCutGrabBox.AllowedShifts:=[ssShift, ssCtrl, ssMeta]
{$else} FShortCutGrabBox.AllowedShifts:=[ssShift, ssCtrl, ssAlt] {$endif};
FShortCutGrabBox.KeyComboBox.OnCloseUp:=@OnGrabBoxCloseUp;
FShortCutGrabBox.KeyComboBox.OnCloseUp:=@GrabBoxCloseUp;
FShortCutGrabBox.Align:=alClient;
FShortCutGrabBox.MainOkButton:=FButtonPanel.OKButton;
if editing then begin
@ -791,7 +791,7 @@ begin
FNewShortcut:=0;
end;
procedure TAddShortcutDialog.OnGrabBoxCloseUp(Sender: TObject);
procedure TAddShortcutDialog.GrabBoxCloseUp(Sender: TObject);
begin
if (FShortCutGrabBox.KeyComboBox.ItemIndex = 0) then
FShortCutGrabBox.ShiftState:=[];

32
ide/buildmanager.pas
View File

@ -93,13 +93,13 @@ type
fEnv: TStringDynArray;
procedure DoOnRescanFPCDirectoryCache(Sender: TObject);
function GetTargetFilename: String;
procedure OnMacroSubstitution(TheMacro: TTransferMacro;
const MacroName: string; var s: string;
const {%H-}Data: PtrInt; var Handled, {%H-}Abort: boolean;
{%H-}Depth: integer);
function OnSubstituteCompilerOption({%H-}Options: TParsedCompilerOptions;
const UnparsedValue: string;
PlatformIndependent: boolean): string;
procedure MacroSubstitution(TheMacro: TTransferMacro;
const MacroName: string; var s: string;
const {%H-}Data: PtrInt; var Handled, {%H-}Abort: boolean;
{%H-}Depth: integer);
function SubstituteCompilerOption({%H-}Options: TParsedCompilerOptions;
const UnparsedValue: string;
PlatformIndependent: boolean): string;
function MacroFuncBuildMode(const {%H-}Param: string; const {%H-}Data: PtrInt;
var {%H-}Abort: boolean): string;
function MacroFuncEnv(const Param: string; const {%H-}Data: PtrInt;
@ -183,7 +183,7 @@ type
DefaultCfgVarsBuildMacroStamp: integer;
procedure Notification(AComponent: TComponent; Operation: TOperation);
override;
function OnGetBuildMacroValues(Options: TBaseCompilerOptions;
function GetBuildMacroValuesHandler(Options: TBaseCompilerOptions;
IncludeSelf: boolean): TCTCfgScriptVariables;
function GetActiveBuildModeName: string;
procedure AppendMatrixCustomOption(Sender: TObject;
@ -311,7 +311,7 @@ begin
FBuildTarget:=nil;
end;
procedure TBuildManager.OnMacroSubstitution(TheMacro: TTransferMacro;
procedure TBuildManager.MacroSubstitution(TheMacro: TTransferMacro;
const MacroName: string; var s: string; const Data: PtrInt; var Handled,
Abort: boolean; Depth: integer);
var
@ -358,7 +358,7 @@ begin
end;
end;
function TBuildManager.OnSubstituteCompilerOption(
function TBuildManager.SubstituteCompilerOption(
Options: TParsedCompilerOptions; const UnparsedValue: string;
PlatformIndependent: boolean): string;
begin
@ -394,7 +394,7 @@ begin
OnBackupFileInteractive:=@BackupFileForWrite;
GetBuildMacroValues:=@OnGetBuildMacroValues;
GetBuildMacroValues:=@GetBuildMacroValuesHandler;
OnAppendCustomOption:=@AppendMatrixCustomOption;
OnGetOutputDirectoryOverride:=@GetMatrixOutputDirectoryOverride;
@ -427,9 +427,9 @@ procedure TBuildManager.SetupTransferMacros;
begin
LazConfMacroFunc:=@BMLazConfMacroFunction;
GlobalMacroList:=TTransferMacroList.Create;
GlobalMacroList.OnSubstitution:=@OnMacroSubstitution;
GlobalMacroList.OnSubstitution:=@MacroSubstitution;
IDEMacros:=TLazIDEMacros.Create;
CompilerOptions.OnParseString:=@OnSubstituteCompilerOption;
CompilerOptions.OnParseString:=@SubstituteCompilerOption;
TIdeTransferMarcros.InitMacros(GlobalMacroList);
@ -2622,7 +2622,7 @@ begin
end;
end;
function TBuildManager.OnGetBuildMacroValues(Options: TBaseCompilerOptions;
function TBuildManager.GetBuildMacroValuesHandler(Options: TBaseCompilerOptions;
IncludeSelf: boolean): TCTCfgScriptVariables;
{off $DEFINE VerboseBuildMacros}
@ -2648,7 +2648,7 @@ function TBuildManager.OnGetBuildMacroValues(Options: TBaseCompilerOptions;
APackage:=TLazPackage(List[i]);
OtherOpts:=APackage.CompilerOptions;
if OtherOpts.BuildMacros=nil then continue;
Values:=OnGetBuildMacroValues(OtherOpts,true);
Values:=GetBuildMacroValuesHandler(OtherOpts,true);
if Values=nil then continue;
for j:=0 to OtherOpts.BuildMacros.Count-1 do begin
Macro:=OtherOpts.BuildMacros[j];
@ -2780,7 +2780,7 @@ begin
Result.Clear;
// use inherited as default
Values:=OnGetBuildMacroValues(Options,false);
Values:=GetBuildMacroValuesHandler(Options,false);
// add macro values of self
if Values<>nil then

24
ide/codetemplatesdlg.pas
View File

@ -97,15 +97,15 @@ type
procedure HelpButtonClick(Sender: TObject);
procedure InsertMacroButtonClick(Sender: TObject);
procedure OkButtonClick(Sender: TObject);
procedure OnCopyMenuItem(Sender: TObject);
procedure OnCutMenuItem(Sender: TObject);
procedure OnInsertMacroMenuItem(Sender: TObject);
procedure OnPasteMenuItem(Sender: TObject);
procedure TemplateListBoxSelectionChange(Sender: TObject; {%H-}User: boolean);
procedure UseMacrosCheckBoxChange(Sender: TObject);
private
SynAutoComplete: TSynEditAutoComplete;
LastTemplate: integer;
procedure CopyMenuItem(Sender: TObject);
procedure CutMenuItem(Sender: TObject);
procedure InsertMacroMenuItem(Sender: TObject);
procedure PasteMenuItem(Sender: TObject);
procedure BuildPopupMenu;
procedure DoInsertMacro;
public
@ -923,22 +923,22 @@ begin
ModalResult:=mrOk;
end;
procedure TCodeTemplateDialog.OnCopyMenuItem(Sender: TObject);
procedure TCodeTemplateDialog.CopyMenuItem(Sender: TObject);
begin
TemplateSynEdit.CopyToClipboard;
end;
procedure TCodeTemplateDialog.OnCutMenuItem(Sender: TObject);
procedure TCodeTemplateDialog.CutMenuItem(Sender: TObject);
begin
TemplateSynEdit.CutToClipboard;
end;
procedure TCodeTemplateDialog.OnInsertMacroMenuItem(Sender: TObject);
procedure TCodeTemplateDialog.InsertMacroMenuItem(Sender: TObject);
begin
DoInsertMacro;
end;
procedure TCodeTemplateDialog.OnPasteMenuItem(Sender: TObject);
procedure TCodeTemplateDialog.PasteMenuItem(Sender: TObject);
begin
TemplateSynEdit.PasteFromClipboard;
end;
@ -1040,10 +1040,10 @@ end;
procedure TCodeTemplateDialog.BuildPopupMenu;
begin
CodeTemplateCopyIDEMenuCommand.OnClick:=@OnCopyMenuItem;
CodeTemplateCutIDEMenuCommand.OnClick:=@OnCutMenuItem;
CodeTemplatePasteIDEMenuCommand.OnClick:=@OnPasteMenuItem;
CodeTemplateInsertMacroIDEMenuCommand.OnClick:=@OnInsertMacroMenuItem;
CodeTemplateCopyIDEMenuCommand.OnClick:=@CopyMenuItem;
CodeTemplateCutIDEMenuCommand.OnClick:=@CutMenuItem;
CodeTemplatePasteIDEMenuCommand.OnClick:=@PasteMenuItem;
CodeTemplateInsertMacroIDEMenuCommand.OnClick:=@InsertMacroMenuItem;
// assign the root TMenuItem to the registered menu root.
MainPopupMenu:=TPopupMenu.Create(Self);

50
ide/customformeditor.pp
View File

@ -81,22 +81,22 @@ type
): TAvlTreeNode;
procedure FrameCompGetCreationClass(Sender: TObject;
var NewComponentClass: TComponentClass);
function OnCompTree_ParentAcceptsChild(aParent, aChild,
function CompTree_ParentAcceptsChild(aParent, aChild,
aLookupRoot: TPersistent): boolean;
procedure OnCompTree_SetParent(aChild, aParent, aLookupRoot: TPersistent);
procedure OnPasWriterFindAncestor(Writer: TCompWriterPas;
procedure CompTree_SetParent(aChild, aParent, aLookupRoot: TPersistent);
procedure PasWriterFindAncestor(Writer: TCompWriterPas;
aComponent: TComponent; const aName: string; var anAncestor,
aRootAncestor: TComponent);
procedure OnPasWriterGetMethodName(Writer: TCompWriterPas;
procedure PasWriterGetMethodName(Writer: TCompWriterPas;
Instance: TPersistent; PropInfo: PPropInfo; out Name: String);
procedure OnPasWriterGetParentProperty(Writer: TCompWriterPas;
procedure PasWriterGetParentProperty(Writer: TCompWriterPas;
Component: TComponent; var PropName: string);
function OnPropHookGetAncestorInstProp(const InstProp: TInstProp;
out AncestorInstProp: TInstProp): boolean;
protected
FNonFormForms: TAvlTree; // tree of TNonFormProxyDesignerForm sorted for LookupRoot
procedure SetSelection(const ASelection: TPersistentSelectionList);
procedure OnObjectInspectorModified(Sender: TObject);
procedure ObjectInspectorModified(Sender: TObject);
procedure SetObj_Inspector(AnObjectInspector: TObjectInspectorDlg); virtual;
procedure JITListBeforeCreate(Sender: TObject; Instance: TPersistent);
procedure JITListException(Sender: TObject; E: Exception;
@ -115,7 +115,7 @@ type
function GetDesignerBaseClasses(Index: integer): TComponentClass; override;
function GetStandardDesignerBaseClasses(Index: integer): TComponentClass; override;
procedure SetStandardDesignerBaseClasses(Index: integer; AValue: TComponentClass); override;
procedure OnDesignerMenuItemClick(Sender: TObject); virtual;
procedure DesignerMenuItemClick(Sender: TObject); virtual;
function FindNonFormFormNode(LookupRoot: TComponent): TAvlTreeNode;
//because we only meet ObjInspectore here, not in abstract ancestor
@ -507,7 +507,7 @@ begin
JITNonFormList := TJITNonFormComponents.Create(nil);
InitJITList(JITNonFormList);
DesignerMenuItemClick:=@OnDesignerMenuItemClick;
OnDesignerMenuItemClick:=@DesignerMenuItemClick;
OnGetDesignerForm:=@GetDesignerForm;
FormEditingHook:=Self;
@ -521,7 +521,7 @@ end;
destructor TCustomFormEditor.Destroy;
begin
FormEditingHook:=nil;
DesignerMenuItemClick:=nil;
OnDesignerMenuItemClick:=nil;
if FDefineProperties<>nil then begin
FDefineProperties.FreeAndClear;
FreeAndNil(FDefineProperties);
@ -1153,9 +1153,9 @@ end;
procedure TCustomFormEditor.SaveComponentAsPascal(aDesigner: TIDesigner;
Writer: TCompWriterPas);
begin
Writer.OnFindAncestor:=@OnPasWriterFindAncestor;
Writer.OnGetParentProperty:=@OnPasWriterGetParentProperty;
Writer.OnGetMethodName:=@OnPasWriterGetMethodName;
Writer.OnFindAncestor:=@PasWriterFindAncestor;
Writer.OnGetParentProperty:=@PasWriterGetParentProperty;
Writer.OnGetMethodName:=@PasWriterGetMethodName;
Writer.WriteDescendant(aDesigner.LookupRoot);
end;
@ -2167,7 +2167,7 @@ begin
IDEMessageDialog(lisCodeToolsDefsReadError, Msg, mtError, [mbCancel]);
end;
procedure TCustomFormEditor.OnDesignerMenuItemClick(Sender: TObject);
procedure TCustomFormEditor.DesignerMenuItemClick(Sender: TObject);
var
CompEditor: TBaseComponentEditor;
MenuItem: TMenuItem;
@ -2184,7 +2184,7 @@ begin
CompEditor.Edit;
except
on E: Exception do begin
DebugLn('TCustomFormEditor.OnDesignerMenuItemClick ERROR on CompEditor.Edit: ',E.Message);
DebugLn('TCustomFormEditor.DesignerMenuItemClick ERROR on CompEditor.Edit: ',E.Message);
IDEMessageDialog(Format(lisErrorIn, [CompClassName]),
Format(lisCFETheComponentEditorOfClassHasCreatedTheError,
[CompClassName, LineEnding, E.Message]),
@ -2195,7 +2195,7 @@ begin
CompEditor.Free;
except
on E: Exception do begin
DebugLn('TCustomFormEditor.OnDesignerMenuItemClick ERROR on CompEditor.Free: ',E.Message);
DebugLn('TCustomFormEditor.DesignerMenuItemClick ERROR on CompEditor.Free: ',E.Message);
IDEMessageDialog(Format(lisErrorIn, [CompClassName]),
Format(lisCFETheComponentEditorOfClassHasCreatedTheError,
[CompClassName, LineEnding, E.Message]),
@ -2392,7 +2392,7 @@ begin
OnSelectFrame(Sender,NewComponentClass);
end;
function TCustomFormEditor.OnCompTree_ParentAcceptsChild(aParent, aChild,
function TCustomFormEditor.CompTree_ParentAcceptsChild(aParent, aChild,
aLookupRoot: TPersistent): boolean;
begin
Result:=(aParent is TComponent)
@ -2401,7 +2401,7 @@ begin
and ParentAcceptsChild(TComponent(aParent),TComponent(aChild),TComponent(aLookupRoot));
end;
procedure TCustomFormEditor.OnCompTree_SetParent(aChild, aParent,
procedure TCustomFormEditor.CompTree_SetParent(aChild, aParent,
aLookupRoot: TPersistent);
var
Mediator: TDesignerMediator;
@ -2417,11 +2417,11 @@ begin
OldParent:=ChildComp.GetParentComponent;
Mediator.ChangeParent(ChildComp,TComponent(aParent));
if ChildComp.GetParentComponent<>OldParent then
OnObjectInspectorModified(Self);
ObjectInspectorModified(Self);
end;
end;
procedure TCustomFormEditor.OnPasWriterFindAncestor(Writer: TCompWriterPas;
procedure TCustomFormEditor.PasWriterFindAncestor(Writer: TCompWriterPas;
aComponent: TComponent; const aName: string; var anAncestor,
aRootAncestor: TComponent);
var
@ -2436,7 +2436,7 @@ begin
if aName='' then ;
end;
procedure TCustomFormEditor.OnPasWriterGetMethodName(Writer: TCompWriterPas;
procedure TCustomFormEditor.PasWriterGetMethodName(Writer: TCompWriterPas;
Instance: TPersistent; PropInfo: PPropInfo; out Name: String);
var
aMethod: TMethod;
@ -2450,7 +2450,7 @@ begin
if Writer=nil then ;
end;
procedure TCustomFormEditor.OnPasWriterGetParentProperty(
procedure TCustomFormEditor.PasWriterGetParentProperty(
Writer: TCompWriterPas; Component: TComponent; var PropName: string);
begin
if Component is TControl then
@ -2664,7 +2664,7 @@ begin
if Y>MaxY then Y:=MaxY;
end;
procedure TCustomFormEditor.OnObjectInspectorModified(Sender: TObject);
procedure TCustomFormEditor.ObjectInspectorModified(Sender: TObject);
var
CustomForm: TCustomForm;
Instance: TPersistent;
@ -2690,10 +2690,10 @@ begin
FObj_Inspector:=AnObjectInspector;
if FObj_Inspector<>nil then begin
FObj_Inspector.OnModified:=@OnObjectInspectorModified;
FObj_Inspector.OnModified:=@ObjectInspectorModified;
FObj_inspector.OnNodeGetImageIndex:= @DoOnNodeGetImageIndex;
FObj_inspector.ComponentTree.OnParentAcceptsChild:=@OnCompTree_ParentAcceptsChild;
FObj_inspector.ComponentTree.OnSetParent:=@OnCompTree_SetParent;
FObj_inspector.ComponentTree.OnParentAcceptsChild:=@CompTree_ParentAcceptsChild;
FObj_inspector.ComponentTree.OnSetParent:=@CompTree_SetParent;
end;
end;

6
ide/debugmanager.pas
View File

@ -108,7 +108,7 @@ type
private
FAsmWindowShouldAutoClose: Boolean;
procedure BreakAutoContinueTimer(Sender: TObject);
procedure OnRunTimer(Sender: TObject);
procedure RunTimer(Sender: TObject);
// Menu events
procedure mnuViewDebugDialogClick(Sender: TObject);
procedure mnuResetDebuggerClicked(Sender: TObject);
@ -1173,7 +1173,7 @@ begin
FDebugger.Run;
end;
procedure TDebugManager.OnRunTimer(Sender: TObject);
procedure TDebugManager.RunTimer(Sender: TObject);
begin
FRunTimer.Enabled:=false;
if dmsWaitForRun in FManagerStates then
@ -2061,7 +2061,7 @@ begin
FAutoContinueTimer.OnTimer := @BreakAutoContinueTimer;
FRunTimer := TTimer.Create(Self);
FRunTimer.Interval := 1;
FRunTimer.OnTimer := @OnRunTimer;
FRunTimer.OnTimer := @RunTimer;
FWatches.OnModified := @DoProjectModified;

39
ide/etmessageframe.pas
View File

@ -68,7 +68,7 @@ type
fPaintTop: integer; // only valid if FPaintStamp=Control.FPaintStamp
FPendingChanges: TETMultiSrcChanges;
procedure SetFilter(AValue: TLMsgViewFilter);
procedure OnMarksFixed(ListOfTMessageLine: TFPList); // (main thread) called after mlfFixed was added to these messages
procedure MarksFixed(ListOfTMessageLine: TFPList); // (main thread) called after mlfFixed was added to these messages
procedure CallOnChangedInMainThread({%H-}Data: PtrInt); // (main thread)
function AsHintString(const aHintLastLine: integer): string;
protected
@ -184,7 +184,7 @@ type
function GetSelectedLine: integer;
function GetUrgencyStyles(Urgency: TMessageLineUrgency): TMsgCtrlUrgencyStyle;
function GetViews(Index: integer): TLMsgWndView;
procedure OnViewChanged(Sender: TObject); // (main thread)
procedure ViewChanged(Sender: TObject); // (main thread)
procedure MsgCtrlMouseMove(Sender: TObject; {%H-}Shift: TShiftState; {%H-}X,Y: Integer);
procedure MsgUpdateTimerTimer(Sender: TObject);
procedure SetActiveFilter(AValue: TLMsgViewFilter); inline;
@ -212,7 +212,7 @@ type
procedure WMKillFocus(var Message: TLMKillFocus); message LM_KILLFOCUS;
procedure ImageListChange(Sender: TObject);
procedure OnIdle(Sender: TObject; var {%H-}Done: Boolean);
procedure OnFilterChanged(Sender: TObject);
procedure FilterChanged(Sender: TObject);
function GetPageScroll: integer;
protected
FViews: TFPList;// list of TMessagesViewMap
@ -328,6 +328,14 @@ type
SearchNextSpeedButton: TSpeedButton;
SearchPanel: TPanel;
SearchPrevSpeedButton: TSpeedButton;
procedure HideSearchSpeedButtonClick(Sender: TObject);
procedure MsgCtrlPopupMenuPopup(Sender: TObject);
procedure SearchEditChange(Sender: TObject);
procedure SearchEditKeyDown(Sender: TObject; var Key: Word; {%H-}Shift: TShiftState);
procedure SearchNextSpeedButtonClick(Sender: TObject);
procedure SearchPrevSpeedButtonClick(Sender: TObject);
private
// Event handlers
procedure AboutToolMenuItemClick(Sender: TObject);
procedure AddFilterMenuItemClick(Sender: TObject);
procedure ClearFilterMsgTypesMenuItemClick(Sender: TObject);
@ -343,19 +351,12 @@ type
procedure FilterHintsWithoutPosMenuItemClick(Sender: TObject);
procedure FilterMsgOfTypeMenuItemClick(Sender: TObject);
procedure FilterUrgencyMenuItemClick(Sender: TObject);
procedure HideSearchSpeedButtonClick(Sender: TObject);
procedure MoreOptionsMenuItemClick(Sender: TObject);
procedure MsgCtrlPopupMenuPopup(Sender: TObject);
procedure OnSelectFilterClick(Sender: TObject);
procedure SelectFilterClick(Sender: TObject);
procedure OpenToolsOptionsMenuItemClick(Sender: TObject);
procedure RemoveCompOptHideMsgClick(Sender: TObject);
procedure SaveAllToFileMenuItemClick(Sender: TObject);
procedure SaveShownToFileMenuItemClick(Sender: TObject);
procedure SearchEditChange(Sender: TObject);
procedure SearchEditKeyDown(Sender: TObject; var Key: Word;
{%H-}Shift: TShiftState);
procedure SearchNextSpeedButtonClick(Sender: TObject);
procedure SearchPrevSpeedButtonClick(Sender: TObject);
procedure ShowIDMenuItemClick(Sender: TObject);
procedure SrcEditLinesChanged(Sender: TObject);
procedure TranslateMenuItemClick(Sender: TObject);
@ -580,7 +581,7 @@ end;
{ TLMsgWndView }
procedure TLMsgWndView.OnMarksFixed(ListOfTMessageLine: TFPList);
procedure TLMsgWndView.MarksFixed(ListOfTMessageLine: TFPList);
var
i: Integer;
ViewLine: TMessageLine;
@ -798,7 +799,7 @@ constructor TLMsgWndView.Create(AOwner: TComponent);
begin
fMessageLineClass:=TLMsgViewLine;
inherited Create(AOwner);
Lines.OnMarksFixed:=@OnMarksFixed;
Lines.OnMarksFixed:=@MarksFixed;
FFilter:=TLMsgViewFilter.Create;
fPendingChanges:=TETMultiSrcChanges.Create(nil);
end;
@ -1091,7 +1092,7 @@ begin
Result:=TLMsgWndView(FViews[Index]);
end;
procedure TMessagesCtrl.OnViewChanged(Sender: TObject);
procedure TMessagesCtrl.ViewChanged(Sender: TObject);
var
AllViewsStopped: Boolean;
i: Integer;
@ -1459,7 +1460,7 @@ begin
IdleConnected:=false;
end;
procedure TMessagesCtrl.OnFilterChanged(Sender: TObject);
procedure TMessagesCtrl.FilterChanged(Sender: TObject);
begin
IdleConnected:=true;
end;
@ -2532,7 +2533,7 @@ begin
inherited Create(AOwner);
ControlStyle:=ControlStyle-[csCaptureMouse]+[csReflector];
FOptions:=MCDefaultOptions;
Filters.OnChanged:=@OnFilterChanged;
Filters.OnChanged:=@FilterChanged;
FActiveFilter:=Filters[0];
FViews:=TFPList.Create;
FSelectedLines:=TIntegerList.Create;
@ -2680,7 +2681,7 @@ begin
Result.Filter.Assign(ActiveFilter);
FViews.Add(Result);
FreeNotification(Result);
Result.OnChanged:=@OnViewChanged;
Result.OnChanged:=@ViewChanged;
fSomeViewsRunning:=true;
end;
@ -2884,7 +2885,7 @@ procedure TMessagesFrame.MsgCtrlPopupMenuPopup(Sender: TObject);
if i>=MsgSelectFilterMenuSection.Count then begin
Item:=RegisterIDEMenuCommand(MsgSelectFilterMenuSection,'MsgSelectFilter'+IntToStr(i),'');
Item.Tag:=i;
Item.OnClick:=@OnSelectFilterClick;
Item.OnClick:=@SelectFilterClick;
end else
Item:=MsgSelectFilterMenuSection[i] as TIDEMenuCommand;
Item.Caption:=Filter.Caption;
@ -3067,7 +3068,7 @@ begin
end;
end;
procedure TMessagesFrame.OnSelectFilterClick(Sender: TObject);
procedure TMessagesFrame.SelectFilterClick(Sender: TObject);
var
Filter: TLMsgViewFilter;
Item: TIDEMenuCommand;

14
ide/etmessageswnd.pas
View File

@ -50,8 +50,8 @@ type
MessagesFrame1: TMessagesFrame;
procedure FormCreate(Sender: TObject);
procedure FormDestroy(Sender: TObject);
procedure OnMsgCtrlOptsChanged(Sender: TObject);
function OnOpenMessage(Sender: TObject; Msg: TMessageLine): boolean;
procedure MsgCtrlOptsChanged(Sender: TObject);
function OpenMessage(Sender: TObject; Msg: TMessageLine): boolean;
private
function GetDblClickJumps: boolean;
function GetShowMessagesIcons: boolean;
@ -113,8 +113,8 @@ begin
except
end;
{$ENDIF}
MessagesFrame1.MessagesCtrl.OnOpenMessage:=@OnOpenMessage;
MessagesFrame1.MessagesCtrl.OnOptionsChanged:=@OnMsgCtrlOptsChanged;
MessagesFrame1.MessagesCtrl.OnOpenMessage:=@OpenMessage;
MessagesFrame1.MessagesCtrl.OnOptionsChanged:=@MsgCtrlOptsChanged;
ActiveControl:=MessagesFrame1.MessagesCtrl;
end;
@ -124,7 +124,7 @@ begin
IDEMessagesWindow:=nil;
end;
procedure TMessagesView.OnMsgCtrlOptsChanged(Sender: TObject);
procedure TMessagesView.MsgCtrlOptsChanged(Sender: TObject);
begin
if mcoWndStayOnTop in MessagesFrame1.MessagesCtrl.Options then
FormStyle:=fsStayOnTop
@ -132,7 +132,7 @@ begin
FormStyle:=fsNormal;
end;
function TMessagesView.OnOpenMessage(Sender: TObject; Msg: TMessageLine): boolean;
function TMessagesView.OpenMessage(Sender: TObject; Msg: TMessageLine): boolean;
begin
Result:=false;
// ask quickfixes
@ -280,7 +280,7 @@ end;
procedure TMessagesView.ApplyIDEOptions;
begin
MessagesFrame1.ApplyIDEOptions;
OnMsgCtrlOptsChanged(Self);
MsgCtrlOptsChanged(Self);
end;
function TMessagesView.GetDblClickJumps: boolean;

12
ide/frames/compiler_modematrix.pas
View File

@ -89,8 +89,8 @@ type
procedure GridSelection(Sender: TObject; {%H-}aCol, {%H-}aRow: Integer);
procedure GridSetEditText(Sender: TObject; ACol, ARow: Integer; const Value: string);
procedure GridShowHint(Sender: TObject; HintInfo: PHintInfo);
procedure OnAddMacroMenuItemClick(Sender: TObject);
procedure OnAddLCLWidgetTypeClick(Sender: TObject);
procedure AddMacroMenuItemClick(Sender: TObject);
procedure AddLCLWidgetTypeClick(Sender: TObject);
procedure BMMSystemEncodingButtonClick(Sender: TObject);
private
FDialog: TAbstractOptionsEditorDialog;
@ -487,7 +487,7 @@ begin
HintInfo^.HintStr:=h;
end;
procedure TCompOptModeMatrixFrame.OnAddMacroMenuItemClick(Sender: TObject);
procedure TCompOptModeMatrixFrame.AddMacroMenuItemClick(Sender: TObject);
var
ValueMenuItem: TMenuItem;
MacroMenuItem: TMenuItem;
@ -501,7 +501,7 @@ begin
CreateNewOption(BuildMatrixOptionTypeCaption(bmotIDEMacro),MacroName+':='+Value);
end;
procedure TCompOptModeMatrixFrame.OnAddLCLWidgetTypeClick(Sender: TObject);
procedure TCompOptModeMatrixFrame.AddLCLWidgetTypeClick(Sender: TObject);
var
TargetFrame: TCompilerConfigTargetFrame;
ValueMenuItem: TMenuItem;
@ -615,7 +615,7 @@ begin
ParentMenu.Items.Add(TMenuItem.Create(Self));
ValueMI:=ParentMenu.Items[i];
ValueMI.Caption:=Format(fCaptionPatternMacroValue,[DirNameToDisplayName(Mcr.Values[i])]);
ValueMI.OnClick:=@OnAddLCLWidgetTypeClick;
ValueMI.OnClick:=@AddLCLWidgetTypeClick;
end;
end;
end;
@ -631,7 +631,7 @@ begin
ParentMI.Add(TMenuItem.Create(Self));
ValueMI:=ParentMI.Items[i];
ValueMI.Caption:=Format(fCaptionPatternMacroValue,[Mcr.Values[i]]);
ValueMI.OnClick:=@OnAddMacroMenuItemClick;
ValueMI.OnClick:=@AddMacroMenuItemClick;
end;
end;
end;

60
ide/frames/compiler_other_options.pas
View File

@ -89,16 +89,16 @@ type
procedure UpdateMessages;
procedure UpdateStatusBar;
procedure OnIdle(Sender: TObject; var {%H-}Done: Boolean);
procedure OnSynCompletionCancel(Sender: TObject);
procedure OnSynCompletionExecute(Sender: TObject);
procedure OnSynCompletionKeyCompletePrefix(Sender: TObject);
procedure OnSynCompletionKeyDelete(Sender: TObject);
procedure OnSynCompletionKeyDown(Sender: TObject; var Key: Word; {%H-}Shift: TShiftState);
procedure OnSynCompletionKeyNextChar(Sender: TObject);
procedure OnSynCompletionKeyPrevChar(Sender: TObject);
procedure OnSynCompletionSearchPosition(var Position: integer);
procedure OnSynCompletionUTF8KeyPress(Sender: TObject; var {%H-}UTF8Key: TUTF8Char);
procedure OnSynCompletionValidate(Sender: TObject; {%H-}KeyChar: TUTF8Char;
procedure SynCompletionCancel(Sender: TObject);
procedure SynCompletionExecute(Sender: TObject);
procedure SynCompletionKeyCompletePrefix(Sender: TObject);
procedure SynCompletionKeyDelete(Sender: TObject);
procedure SynCompletionKeyDown(Sender: TObject; var Key: Word; {%H-}Shift: TShiftState);
procedure SynCompletionKeyNextChar(Sender: TObject);
procedure SynCompletionKeyPrevChar(Sender: TObject);
procedure SynCompletionSearchPosition(var Position: integer);
procedure SynCompletionUTF8KeyPress(Sender: TObject; var {%H-}UTF8Key: TUTF8Char);
procedure SynCompletionValidate(Sender: TObject; {%H-}KeyChar: TUTF8Char;
{%H-}Shift: TShiftState);
protected
procedure SetVisible(Value: Boolean); override;
@ -231,7 +231,7 @@ begin
UpdateStatusBar;
end;
procedure TCompilerOtherOptionsFrame.OnSynCompletionCancel(Sender: TObject);
procedure TCompilerOtherOptionsFrame.SynCompletionCancel(Sender: TObject);
begin
{$IFDEF VerboseCOCondSynCompletion}
debugln(['TCompilerOtherOptionsFrame.OnSynCompletionCancel ',fSynCompletion.TheForm.Visible]);
@ -242,14 +242,14 @@ begin
//fSynCompletion.Editor:=nil;
end;
procedure TCompilerOtherOptionsFrame.OnSynCompletionExecute(Sender: TObject);
procedure TCompilerOtherOptionsFrame.SynCompletionExecute(Sender: TObject);
begin
{$IFDEF VerboseCOCondSynCompletion}
debugln(['TCompilerOtherOptionsFrame.OnSynCompletionExecute ']);
{$ENDIF}
end;
procedure TCompilerOtherOptionsFrame.OnSynCompletionKeyCompletePrefix(
procedure TCompilerOtherOptionsFrame.SynCompletionKeyCompletePrefix(
Sender: TObject);
begin
{$IFDEF VerboseCOCondSynCompletion}
@ -257,14 +257,14 @@ begin
{$ENDIF}
end;
procedure TCompilerOtherOptionsFrame.OnSynCompletionKeyDelete(Sender: TObject);
procedure TCompilerOtherOptionsFrame.SynCompletionKeyDelete(Sender: TObject);
begin
{$IFDEF VerboseCOCondSynCompletion}
debugln(['TCompilerOtherOptionsFrame.OnSynCompletionKeyDelete']);
{$ENDIF}
end;
procedure TCompilerOtherOptionsFrame.OnSynCompletionKeyDown(Sender: TObject;
procedure TCompilerOtherOptionsFrame.SynCompletionKeyDown(Sender: TObject;
var Key: Word; Shift: TShiftState);
begin
{$IFDEF VerboseCOCondSynCompletion}
@ -278,7 +278,7 @@ begin
end;
end;
procedure TCompilerOtherOptionsFrame.OnSynCompletionKeyNextChar(Sender: TObject);
procedure TCompilerOtherOptionsFrame.SynCompletionKeyNextChar(Sender: TObject);
var
XY: TPoint;
StartX: integer;
@ -297,7 +297,7 @@ begin
CondSynEdit.LogicalCaretXY:=XY;
end;
procedure TCompilerOtherOptionsFrame.OnSynCompletionKeyPrevChar(Sender: TObject);
procedure TCompilerOtherOptionsFrame.SynCompletionKeyPrevChar(Sender: TObject);
var
XY: TPoint;
StartX: integer;
@ -316,7 +316,7 @@ begin
CondSynEdit.LogicalCaretXY:=XY;
end;
procedure TCompilerOtherOptionsFrame.OnSynCompletionSearchPosition(var Position: integer);
procedure TCompilerOtherOptionsFrame.SynCompletionSearchPosition(var Position: integer);
var
sl: TStringList;
Prefix: String;
@ -344,7 +344,7 @@ begin
end;
end;
procedure TCompilerOtherOptionsFrame.OnSynCompletionUTF8KeyPress(Sender: TObject;
procedure TCompilerOtherOptionsFrame.SynCompletionUTF8KeyPress(Sender: TObject;
var UTF8Key: TUTF8Char);
begin
{$IFDEF VerboseCOCondSynCompletion}
@ -352,7 +352,7 @@ begin
{$ENDIF}
end;
procedure TCompilerOtherOptionsFrame.OnSynCompletionValidate(Sender: TObject;
procedure TCompilerOtherOptionsFrame.SynCompletionValidate(Sender: TObject;
KeyChar: TUTF8Char; Shift: TShiftState);
var
i: LongInt;
@ -693,16 +693,16 @@ begin
fSynCompletion:=TSynCompletion.Create(Self);
fSynCompletion.ShowSizeDrag:=true;
fSynCompletion.TheForm.Parent:=Self;
fSynCompletion.OnExecute:=@OnSynCompletionExecute;
fSynCompletion.OnCancel:=@OnSynCompletionCancel;
fSynCompletion.OnValidate:=@OnSynCompletionValidate;
fSynCompletion.OnSearchPosition:=@OnSynCompletionSearchPosition;
fSynCompletion.OnKeyCompletePrefix:=@OnSynCompletionKeyCompletePrefix;
fSynCompletion.OnUTF8KeyPress:=@OnSynCompletionUTF8KeyPress;
fSynCompletion.OnKeyNextChar:=@OnSynCompletionKeyNextChar;
fSynCompletion.OnKeyPrevChar:=@OnSynCompletionKeyPrevChar;
fSynCompletion.OnKeyDelete:=@OnSynCompletionKeyDelete;
fSynCompletion.OnKeyDown:=@OnSynCompletionKeyDown;
fSynCompletion.OnExecute:=@SynCompletionExecute;
fSynCompletion.OnCancel:=@SynCompletionCancel;
fSynCompletion.OnValidate:=@SynCompletionValidate;
fSynCompletion.OnSearchPosition:=@SynCompletionSearchPosition;
fSynCompletion.OnKeyCompletePrefix:=@SynCompletionKeyCompletePrefix;
fSynCompletion.OnUTF8KeyPress:=@SynCompletionUTF8KeyPress;
fSynCompletion.OnKeyNextChar:=@SynCompletionKeyNextChar;
fSynCompletion.OnKeyPrevChar:=@SynCompletionKeyPrevChar;
fSynCompletion.OnKeyDelete:=@SynCompletionKeyDelete;
fSynCompletion.OnKeyDown:=@SynCompletionKeyDown;
FOptionsReader := TCompilerOptReader.Create;
end;

12
ide/frames/editor_color_options.pas
View File

@ -169,8 +169,8 @@ type
procedure ApplyCurrentScheme;
procedure UpdateCurrentScheme;
procedure OnStatusChange(Sender: TObject; {%H-}Changes: TSynStatusChanges);
procedure OnSpecialLineMarkup(Sender: TObject; Line: Integer;
procedure StatusChange(Sender: TObject; {%H-}Changes: TSynStatusChanges);
procedure SpecialLineMarkup(Sender: TObject; Line: Integer;
var Special: boolean; aMarkup: TSynSelectedColor);
function GeneralPage: TEditorGeneralOptionsFrame;
@ -1554,8 +1554,8 @@ begin
with GeneralPage do
for i := Low(PreviewEdits) to High(PreviewEdits) do
begin
PreviewEdits[i].OnStatusChange := @OnStatusChange;
PreviewEdits[i].OnSpecialLineMarkup := @OnSpecialLineMarkup;
PreviewEdits[i].OnStatusChange := @StatusChange;
PreviewEdits[i].OnSpecialLineMarkup := @SpecialLineMarkup;
end;
with AOptions as TEditorOptions do
@ -1696,7 +1696,7 @@ begin
FFileExtensions.Values[LanguageName] := FileExtensions;
end;
procedure TEditorColorOptionsFrame.OnSpecialLineMarkup(Sender: TObject;
procedure TEditorColorOptionsFrame.SpecialLineMarkup(Sender: TObject;
Line: Integer; var Special: boolean; aMarkup: TSynSelectedColor);
var
e: TColorSchemeAttribute;
@ -1714,7 +1714,7 @@ begin
end;
end;
procedure TEditorColorOptionsFrame.OnStatusChange(Sender : TObject; Changes : TSynStatusChanges);
procedure TEditorColorOptionsFrame.StatusChange(Sender : TObject; Changes : TSynStatusChanges);
var
Syn: TSynEdit;
p: TPoint;

6
ide/frames/modematrixctrl.pas
View File

@ -234,7 +234,7 @@ type
procedure SetMaxUndo(AValue: integer);
procedure ToggleModeValue(aCol, aRow: integer);
procedure PopupTypes(aRow: integer);
procedure OnTypePopupMenuClick(Sender: TObject);
procedure TypePopupMenuClick(Sender: TObject);
protected
function EditingAllowed(ACol: Integer=-1): Boolean; override;
function GetCells(ACol, ARow: Integer): string; override;
@ -1038,7 +1038,7 @@ begin
fTypePopupMenu.Items.Add(TMenuItem.Create(Self));
Item:=fTypePopupMenu.Items[i];
Item.Caption:=TypeColumn.PickList.Names[i]+': '+TypeColumn.PickList.ValueFromIndex[i];
Item.OnClick:=@OnTypePopupMenuClick;
Item.OnClick:=@TypePopupMenuClick;
end;
// delete not needed items
while fTypePopupMenu.Items.Count>TypeColumn.PickList.Count do
@ -1053,7 +1053,7 @@ begin
fTypePopupMenu.PopUp(XY.X,XY.Y);
end;
procedure TGroupedMatrixControl.OnTypePopupMenuClick(Sender: TObject);
procedure TGroupedMatrixControl.TypePopupMenuClick(Sender: TObject);
var
Item: TMenuItem;
ValueRow: TGroupedMatrixValue;

40
ide/main.pp
View File

@ -192,7 +192,7 @@ type
procedure LazInstancesStartNewInstance(const aFiles: TStrings;
var Result: TStartNewInstanceResult; var outSourceWindowHandle: HWND);
procedure LazInstancesGetOpenedProjectFileName(var outProjectFileName: string);
procedure OnHintWatchValidityChanged(Sender: TObject);
procedure HintWatchValidityChanged(Sender: TObject);
procedure DlgDebugInfoHelpRequested(Sender: TObject; AModalResult: TModalResult; var ACanClose: Boolean);
public
@ -733,14 +733,14 @@ type
procedure ReloadMenuShortCuts;
// methods for creating a project
procedure OnLoadProjectInfoFromXMLConfig(TheProject: TProject;
XMLConfig: TXMLConfig; Merge: boolean);
procedure OnLoadSaveCustomData(Sender: TObject; Load: boolean;
procedure LoadProjectInfoFromXMLConfig(TheProject: TProject;
XMLConfig: TXMLConfig; Merge: boolean);
procedure LoadSaveCustomData(Sender: TObject; Load: boolean;
Data: TStringToStringTree; PathDelimChanged: boolean);
procedure OnSaveProjectInfoToXMLConfig(TheProject: TProject;
procedure SaveProjectInfoToXMLConfig(TheProject: TProject;
XMLConfig: TXMLConfig; WriteFlags: TProjectWriteFlags);
procedure OnProjectChangeInfoFile(TheProject: TProject);
procedure OnSaveProjectUnitSessionInfo(AUnitInfo: TUnitInfo);
procedure ProjectChangeInfoFile(TheProject: TProject);
procedure SaveProjectUnitSessionInfo(AUnitInfo: TUnitInfo);
public
class procedure ParseCmdLineOptions;
@ -5683,7 +5683,7 @@ begin
MainIDEBar.itmFileSaveAll.Enabled := MainIDEBar.itmProjectSave.Enabled;
end;
procedure TMainIDE.OnSaveProjectUnitSessionInfo(AUnitInfo: TUnitInfo);
procedure TMainIDE.SaveProjectUnitSessionInfo(AUnitInfo: TUnitInfo);
function GetWindowState(ACustomForm: TCustomForm): TWindowState;
begin
@ -5706,7 +5706,7 @@ begin
end;
end;
procedure TMainIDE.OnLoadProjectInfoFromXMLConfig(TheProject: TProject;
procedure TMainIDE.LoadProjectInfoFromXMLConfig(TheProject: TProject;
XMLConfig: TXMLConfig; Merge: boolean);
begin
if TheProject<>Project1 then exit;
@ -5714,7 +5714,7 @@ begin
EditorMacroListViewer.LoadProjectSpecificInfo(XMLConfig);
end;
procedure TMainIDE.OnLoadSaveCustomData(Sender: TObject; Load: boolean;
procedure TMainIDE.LoadSaveCustomData(Sender: TObject; Load: boolean;
Data: TStringToStringTree; PathDelimChanged: boolean);
var
Handler: TMethodList;
@ -5726,7 +5726,7 @@ begin
TLazLoadSaveCustomDataEvent(Handler[i])(Sender,Load,Data,PathDelimChanged);
end;
procedure TMainIDE.OnSaveProjectInfoToXMLConfig(TheProject: TProject;
procedure TMainIDE.SaveProjectInfoToXMLConfig(TheProject: TProject;
XMLConfig: TXMLConfig; WriteFlags: TProjectWriteFlags);
begin
if TheProject<>Project1 then exit;
@ -5735,7 +5735,7 @@ begin
EditorMacroListViewer.SaveProjectSpecificInfo(XMLConfig, WriteFlags);
end;
procedure TMainIDE.OnProjectChangeInfoFile(TheProject: TProject);
procedure TMainIDE.ProjectChangeInfoFile(TheProject: TProject);
begin
if (Project1=nil) or (TheProject<>Project1) then exit;
if Project1.IsVirtual then
@ -6387,11 +6387,11 @@ begin
DebugBossMgr.ProjectLink.Project:=Result;
Result.MainProject:=true;
Result.OnFileBackup:=@MainBuildBoss.BackupFileForWrite;
Result.OnLoadProjectInfo:=@OnLoadProjectInfoFromXMLConfig;
Result.OnLoadSafeCustomData:=@OnLoadSaveCustomData;
Result.OnSaveProjectInfo:=@OnSaveProjectInfoToXMLConfig;
Result.OnSaveUnitSessionInfo:=@OnSaveProjectUnitSessionInfo;
Result.OnChangeProjectInfoFile:=@OnProjectChangeInfoFile;
Result.OnLoadProjectInfo:=@LoadProjectInfoFromXMLConfig;
Result.OnLoadSafeCustomData:=@LoadSaveCustomData;
Result.OnSaveProjectInfo:=@SaveProjectInfoToXMLConfig;
Result.OnSaveUnitSessionInfo:=@SaveProjectUnitSessionInfo;
Result.OnChangeProjectInfoFile:=@ProjectChangeInfoFile;
Result.IDEOptions.OnBeforeRead:=@ProjectOptionsBeforeRead;
Result.IDEOptions.OnAfterWrite:=@ProjectOptionsAfterWrite;
end;
@ -11524,7 +11524,7 @@ begin
CodeExplorerView.CurrentCodeBufferChanged;
end;
procedure TMainIDE.OnHintWatchValidityChanged(Sender: TObject);
procedure TMainIDE.HintWatchValidityChanged(Sender: TObject);
var
p: SizeInt;
WatchPrinter: TWatchResultPrinter;
@ -11686,9 +11686,9 @@ begin
if CStack <> nil then
st := CStack.CurrentIndex;
FHintWatchData.WatchValue := aWatch.Values[tid, st] as TCurrentWatchValue;
FHintWatchData.WatchValue.OnValidityChanged := @OnHintWatchValidityChanged;
FHintWatchData.WatchValue.OnValidityChanged := @HintWatchValidityChanged;
FHintWatchData.WatchValue.Value;
OnHintWatchValidityChanged(FHintWatchData.WatchValue);
HintWatchValidityChanged(FHintWatchData.WatchValue);
exit;
end;
end;

6
ide/mainbar.pas
View File

@ -385,7 +385,7 @@ type
procedure CoolBarOnChange(Sender: TObject);
procedure MainSplitterMoved(Sender: TObject);
procedure SetMainIDEHeightEvent(Sender: TObject);
procedure OnMainBarActive(Sender: TObject);
procedure MainBarActive(Sender: TObject);
procedure Setup(TheOwner: TComponent);
procedure SetupHints;
procedure UpdateIDEComponentPalette(IfFormChanged: boolean);
@ -577,7 +577,7 @@ begin
SetMainIDEHeight;
end;
procedure TMainIDEBar.OnMainBarActive(Sender: TObject);
procedure TMainIDEBar.MainBarActive(Sender: TObject);
var
i, FormCount: integer;
AForm: TCustomForm;
@ -664,7 +664,7 @@ end;
procedure TMainIDEBar.Setup(TheOwner: TComponent);
begin
FMainOwningComponent := TheOwner;
OnActive:=@OnMainBarActive;
OnActive:=@MainBarActive;
MainSplitter := TSplitter.Create(TheOwner);
MainSplitter.Parent := Self;

6
ide/mainbase.pas
View File

@ -103,6 +103,7 @@ type
private
FWindowMenuActiveForm: TCustomForm;
FDisplayState: TDisplayState;
function CodeToolBossCheckAbort: boolean;
procedure SetDisplayState(AValue: TDisplayState);
procedure UpdateWindowMenu;
protected
@ -165,7 +166,6 @@ type
out ActiveUnitInfo: TUnitInfo;
Flags: TCodeToolsFlags): boolean;
procedure ActivateCodeToolAbortableMode;
function OnCodeToolBossCheckAbort: boolean;
procedure DoShowDesignerFormOfCurrentSrc(AComponentPaletteClassSelected: Boolean); virtual; abstract;
function CreateDesignerForComponent(AnUnitInfo: TUnitInfo;
AComponent: TComponent): TCustomForm; virtual; abstract;
@ -756,11 +756,11 @@ begin
if ToolStatus=itNone then
RaiseGDBException('TMainIDEBase.ActivateCodeToolAbortableMode Error 1');
ToolStatus:=itCodeTools;
CodeToolBoss.OnCheckAbort:=@OnCodeToolBossCheckAbort;
CodeToolBoss.OnCheckAbort:=@CodeToolBossCheckAbort;
CodeToolBoss.Abortable:=true;
end;
function TMainIDEBase.OnCodeToolBossCheckAbort: boolean;
function TMainIDEBase.CodeToolBossCheckAbort: boolean;
begin
Result:=true;
if ToolStatus<>itCodeTools then exit;

16
ide/packages/ideconfig/ideoptiondefs.pas
View File

@ -207,7 +207,7 @@ type
fFilters: TFPList; // list of TLMsgViewFilter
FOnChanged: TNotifyEvent;
function GetFilters(Index: integer): TLMsgViewFilter;
procedure OnFilterChanged(Sender: TObject);
procedure FilterChanged(Sender: TObject);
procedure SetActiveFilter(AValue: TLMsgViewFilter);
public
constructor Create(AOwner: TComponent); override;
@ -382,7 +382,7 @@ begin
Result:=TLMsgViewFilter(fFilters[Index]);
end;
procedure TLMsgViewFilters.OnFilterChanged(Sender: TObject);
procedure TLMsgViewFilters.FilterChanged(Sender: TObject);
begin
if csDestroying in ComponentState then exit;
if Assigned(OnChanged) then
@ -400,7 +400,7 @@ begin
FActiveFilter.Assign(AValue);
end else
FActiveFilter:=AValue;
OnFilterChanged(AValue);
FilterChanged(AValue);
end;
constructor TLMsgViewFilters.Create(AOwner: TComponent);
@ -409,7 +409,7 @@ begin
fFilters:=TFPList.Create;
FActiveFilter:=TLMsgViewFilter.Create;
FActiveFilter.Caption:='Default';
FActiveFilter.OnChanged:=@OnFilterChanged;
FActiveFilter.OnChanged:=@FilterChanged;
fFilters.Add(FActiveFilter);
end;
@ -444,7 +444,7 @@ begin
exit(nil);
Result:=TLMsgViewFilter.Create;
Result.Caption:=aCaption;
Result.OnChanged:=@OnFilterChanged;
Result.OnChanged:=@FilterChanged;
Add(Result);
end;
@ -461,15 +461,15 @@ begin
if ActiveFilter=Filter then
FActiveFilter:=Filters[0];
Filter.Free;
OnFilterChanged(Self);
FilterChanged(Self);
end;
end;
function TLMsgViewFilters.Add(Filter: TLMsgViewFilter): integer;
begin
Filter.OnChanged:=@OnFilterChanged;
Filter.OnChanged:=@FilterChanged;
Result:=fFilters.Add(Filter);
OnFilterChanged(Self);
FilterChanged(Self);
end;
procedure TLMsgViewFilters.LoadFromXMLConfig(XMLConfig: TXMLConfig;

16
ide/project.pp
View File

@ -628,7 +628,7 @@ type
FGlobalMatrixOptions: TBuildMatrixOptions;
function GetItems(Index: integer): TProjectBuildMode;
function GetModified: boolean;
procedure OnItemChanged(Sender: TObject);
procedure ItemChanged(Sender: TObject);
procedure SetModified(const AValue: boolean);
// Used by LoadFromXMLConfig
procedure AddMatrixMacro(const MacroName, MacroValue, ModeIdentifier: string; InSession: boolean);
@ -858,7 +858,7 @@ type
procedure LoadDefaultSession;
procedure EditorInfoAdd(EdInfo: TUnitEditorInfo);
procedure EditorInfoRemove(EdInfo: TUnitEditorInfo);
procedure OnMacroEngineSubstitution({%H-}TheMacro: TTransferMacro;
procedure MacroEngineSubstitution({%H-}TheMacro: TTransferMacro;
const MacroName: string; var s: string;
const Data: PtrInt; var Handled, Abort: boolean; Depth: integer);
// Methods for ReadProject
@ -2779,7 +2779,7 @@ begin
FBookmarks := TProjectBookmarkList.Create;
FMacroEngine:=TTransferMacroList.Create;
FMacroEngine.OnSubstitution:=@OnMacroEngineSubstitution;
FMacroEngine.OnSubstitution:=@MacroEngineSubstitution;
FBuildModes:=TProjectBuildModes.Create(nil);
FBuildModes.LazProject:=Self;
FBuildModesBackup:=TProjectBuildModes.Create(nil);
@ -5768,7 +5768,7 @@ begin
FAllEditorsInfoMap.Delete(EdInfo.EditorComponent);
end;
procedure TProject.OnMacroEngineSubstitution(TheMacro: TTransferMacro;
procedure TProject.MacroEngineSubstitution(TheMacro: TTransferMacro;
const MacroName: string; var s: string; const Data: PtrInt; var Handled,
Abort: boolean; Depth: integer);
var
@ -7092,7 +7092,7 @@ begin
Result:=fSavedChangeStamp<>FChangeStamp;
end;
procedure TProjectBuildModes.OnItemChanged(Sender: TObject);
procedure TProjectBuildModes.ItemChanged(Sender: TObject);
begin
{$IFDEF VerboseIDEModified}
debugln(['TProjectBuildModes.OnItemChanged ',DbgSName(Sender)]);
@ -7123,9 +7123,9 @@ begin
FChangeStamp:=LUInvalidChangeStamp;
fSavedChangeStamp:=FChangeStamp;
FSharedMatrixOptions:=TBuildMatrixOptions.Create;
FSharedMatrixOptions.OnChanged:=@OnItemChanged;
FSharedMatrixOptions.OnChanged:=@ItemChanged;
FSessionMatrixOptions:=TBuildMatrixOptions.Create;
FSessionMatrixOptions.OnChanged:=@OnItemChanged;
FSessionMatrixOptions.OnChanged:=@ItemChanged;
FManyBuildModes:=TStringList.Create;
end;
@ -7233,7 +7233,7 @@ begin
Result.FIdentifier:=Identifier;
if LazProject<>nil then
Result.CompilerOptions.BaseDirectory:=LazProject.Directory;
Result.AddOnChangedHandler(@OnItemChanged);
Result.AddOnChangedHandler(@ItemChanged);
fItems.Add(Result);
end;

6
ide/projectresources.pas
View File

@ -84,7 +84,7 @@ type
procedure UpdateLrsCodeBuffer;
procedure DeleteLastCodeBuffers;
procedure OnResourceModified(Sender: TObject);
procedure ResourceModified(Sender: TObject);
protected
procedure SetResourceType(const AValue: TResourceType); override;
function GetProjectResource(AIndex: TAbstractProjectResourceClass): TAbstractProjectResource; override;
@ -406,7 +406,7 @@ begin
end;
end;
procedure TProjectResources.OnResourceModified(Sender: TObject);
procedure TProjectResources.ResourceModified(Sender: TObject);
begin
Modified := Modified or TAbstractProjectResource(Sender).Modified;
end;
@ -432,7 +432,7 @@ begin
begin
R := TAbstractProjectResourceClass(L[i]).Create;
R.Modified := False;
R.OnModified := @OnResourceModified;
R.OnModified := @ResourceModified;
FResources.Add(R);
end;
end;

8
ide/searchfrm.pas
View File

@ -62,8 +62,6 @@ type
Panel2: TPANEL;
procedure FormClose(Sender: TObject; var {%H-}CloseAction: TCloseAction);
procedure FormShow(Sender: TObject);
procedure OnAddMatch(const Filename: string; const StartPos, EndPos: TPoint;
const Lines: string);
procedure SearchFormCREATE(Sender: TObject);
procedure SearchFormDESTROY(Sender: TObject);
procedure btnAbortCLICK(Sender: TObject);
@ -92,6 +90,8 @@ type
fAborting: boolean;
fLastUpdateProgress: DWORD;
fWasActive: boolean;
procedure AddMatchHandler(const Filename: string; const StartPos, EndPos: TPoint;
const Lines: string);
procedure DoFindInFiles(ADirectories: string);
procedure DoFindInSearchList;
procedure SetResultsList(const AValue: TStrings);
@ -692,7 +692,7 @@ begin
btnCancel.Caption:=lisCancel;
fProgress:=TIDESearchInTextProgress.Create;
FProgress.OnAddMatch:=@OnAddMatch;
FProgress.OnAddMatch:=@AddMatchHandler;
fFlags:=[];
fPromptOnReplace:=true;
@ -708,7 +708,7 @@ begin
fWasActive:= false;
end;
procedure TSearchProgressForm.OnAddMatch(const Filename: string; const StartPos,
procedure TSearchProgressForm.AddMatchHandler(const Filename: string; const StartPos,
EndPos: TPoint; const Lines: string);
var
MatchLen: Integer;

193
ide/sourceeditor.pp
View File

@ -143,17 +143,17 @@ type
procedure ccComplete(var Value: string; SourceValue: string;
var SourceStart, SourceEnd: TPoint;
KeyChar: TUTF8Char; Shift: TShiftState);
function OnSynCompletionPaintItem(const AKey: string; ACanvas: TCanvas;
function SynCompletionPaintItem(const AKey: string; ACanvas: TCanvas;
X, Y: integer; ItemSelected: boolean; Index: integer): boolean;
function OnSynCompletionMeasureItem(const AKey: string; ACanvas: TCanvas;
function SynCompletionMeasureItem(const AKey: string; ACanvas: TCanvas;
ItemSelected: boolean; Index: integer): TPoint;
procedure OnSynCompletionSearchPosition(var APosition: integer);
procedure OnSynCompletionCompletePrefix(Sender: TObject);
procedure OnSynCompletionNextChar(Sender: TObject);
procedure OnSynCompletionPrevChar(Sender: TObject);
procedure OnSynCompletionKeyPress(Sender: TObject; var Key: Char);
procedure OnSynCompletionUTF8KeyPress(Sender: TObject; var UTF8Key: TUTF8Char);
procedure OnSynCompletionPositionChanged(Sender: TObject);
procedure SynCompletionSearchPosition(var APosition: integer);
procedure SynCompletionCompletePrefix(Sender: TObject);
procedure SynCompletionNextChar(Sender: TObject);
procedure SynCompletionPrevChar(Sender: TObject);
procedure SynCompletionKeyPress(Sender: TObject; var Key: Char);
procedure SynCompletionUTF8KeyPress(Sender: TObject; var UTF8Key: TUTF8Char);
procedure SynCompletionPositionChanged(Sender: TObject);
function InitIdentCompletionValues(S: TStrings): boolean;
procedure StartShowCodeHelp;
@ -349,7 +349,7 @@ type
procedure FocusEditor;// called by TSourceNotebook when the Notebook page
// changes so the editor is focused
procedure OnEditorSpecialLineColor(Sender: TObject; Line: integer;
procedure EditorSpecialLineColor(Sender: TObject; Line: integer;
var Special: boolean; Markup: TSynSelectedColor);
function RefreshEditorSettings: Boolean;
function GetModified: Boolean; override;
@ -396,7 +396,7 @@ type
procedure StartFindAndReplace(Replace:boolean);
procedure AskReplace(Sender: TObject; const ASearch, AReplace:
string; Line, Column: integer; out Action: TSrcEditReplaceAction); override;
procedure OnReplace(Sender: TObject; const ASearch, AReplace:
procedure ReplaceTxtHandler(Sender: TObject; const ASearch, AReplace:
string; {%H-}Line, {%H-}Column: integer; var Action: TSynReplaceAction);
function DoFindAndReplace(aFindText, aReplaceText: String; anOptions: TSynSearchOptions): Integer;
procedure FindNextUTF8;
@ -666,44 +666,44 @@ type
OpenFolderMenuItem: TMenuItem;
StatusPopUpMenu: TPopupMenu;
StatusBar: TStatusBar;
procedure CompleteCodeMenuItemClick(Sender: TObject);
procedure DbgPopUpMenuPopup(Sender: TObject);
procedure EditorLockClicked(Sender: TObject);
procedure EncodingClicked(Sender: TObject);
procedure ExtractProcMenuItemClick(Sender: TObject);
procedure FindOverloadsMenuItemClick(Sender: TObject);
procedure FormMouseUp(Sender: TObject; {%H-}Button: TMouseButton;
{%H-}Shift: TShiftState; {%H-}X, {%H-}Y: Integer);
procedure FormResize(Sender: TObject);
procedure GoToLineMenuItemClick(Sender: TObject);
procedure HighlighterClicked(Sender: TObject);
procedure InsertCharacter(const C: TUTF8Char);
procedure InvertAssignmentMenuItemClick(Sender: TObject);
procedure LineEndingClicked(Sender: TObject);
procedure MakeResourceStringMenuItemClick(Sender: TObject);
procedure NotebookPageChanged(Sender: TObject);
procedure NotebookShowTabHint(Sender: TObject; HintInfo: PHintInfo);
procedure OnPopupMenuOpenFile(Sender: TObject);
procedure OnPopupOpenPackageFile(Sender: TObject);
procedure OnPopupOpenProjectInsp(Sender: TObject);
procedure OpenAtCursorClicked(Sender: TObject);
procedure OpenFolderMenuItemClick(Sender: TObject);
procedure RenameIdentifierMenuItemClick(Sender: TObject);
procedure ShowAbstractMethodsMenuItemClick(Sender: TObject);
procedure ShowEmptyMethodsMenuItemClick(Sender: TObject);
procedure ShowUnusedUnitsMenuItemClick(Sender: TObject);
procedure SourceNotebookDropFiles(Sender: TObject;
const FileNames: array of String);
procedure SrcEditMenuCopyToExistingWindowClicked(Sender: TObject);
procedure SrcEditMenuFindInWindowClicked(Sender: TObject);
procedure SrcEditMenuMoveToExistingWindowClicked(Sender: TObject);
procedure SrcPopUpMenuPopup(Sender: TObject);
procedure StatusBarClick(Sender: TObject);
procedure StatusBarDblClick(Sender: TObject);
procedure StatusBarContextPopup(Sender: TObject; MousePos: TPoint;
var {%H-}Handled: Boolean);
procedure StatusBarDrawPanel({%H-}AStatusBar: TStatusBar; APanel: TStatusPanel;
const ARect: TRect);
private
//procedure CompleteCodeMenuItemClick(Sender: TObject);
procedure DbgPopUpMenuPopup(Sender: TObject);
//procedure EditorLockClicked(Sender: TObject);
procedure EncodingClicked(Sender: TObject);
//procedure ExtractProcMenuItemClick(Sender: TObject);
//procedure FindOverloadsMenuItemClick(Sender: TObject);
procedure HighlighterClicked(Sender: TObject);
//procedure InsertCharacter(const C: TUTF8Char);
//procedure InvertAssignmentMenuItemClick(Sender: TObject);
procedure LineEndingClicked(Sender: TObject);
//procedure MakeResourceStringMenuItemClick(Sender: TObject);
procedure NotebookPageChanged(Sender: TObject);
procedure NotebookShowTabHint(Sender: TObject; HintInfo: PHintInfo);
procedure PopupMenuOpenFile(Sender: TObject);
procedure PopupOpenPackageFile(Sender: TObject);
procedure PopupOpenProjectInsp(Sender: TObject);
procedure OpenAtCursorClicked(Sender: TObject);
//procedure RenameIdentifierMenuItemClick(Sender: TObject);
//procedure ShowAbstractMethodsMenuItemClick(Sender: TObject);
//procedure ShowEmptyMethodsMenuItemClick(Sender: TObject);
//procedure ShowUnusedUnitsMenuItemClick(Sender: TObject);
procedure SourceNotebookDropFiles(Sender: TObject; const FileNames: array of String);
procedure SrcEditMenuCopyToExistingWindowClicked(Sender: TObject);
procedure SrcEditMenuFindInWindowClicked(Sender: TObject);
procedure SrcEditMenuMoveToExistingWindowClicked(Sender: TObject);
procedure SrcPopUpMenuPopup(Sender: TObject);
procedure TabPopUpMenuPopup(Sender: TObject);
private
FNotebook: TExtendedNotebook;
@ -1257,17 +1257,16 @@ type
private
FCodeTemplateModul: TSynEditAutoComplete;
FGotoDialog: TfrmGoto;
procedure OnCodeTemplateTokenNotFound(Sender: TObject; AToken: string;
procedure CodeTemplateTokenNotFound(Sender: TObject; AToken: string;
AnEditor: TCustomSynEdit; var Index:integer);
procedure OnCodeTemplateExecuteCompletion(
ASynAutoComplete: TCustomSynAutoComplete;
Index: integer);
procedure CodeTemplateExecuteCompletion(
ASynAutoComplete: TCustomSynAutoComplete; Index: integer);
protected
procedure CodeToolsToSrcEditTimerTimer(Sender: TObject);
procedure OnSourceCompletionTimer(Sender: TObject);
procedure SourceCompletionTimer(Sender: TObject);
// marks
procedure OnSourceMarksAction(AMark: TSourceMark; {%H-}AAction: TMarksAction);
procedure OnSourceMarksGetSynEdit(Sender: TObject; aFilename: string;
procedure SourceMarksAction(AMark: TSourceMark; {%H-}AAction: TMarksAction);
procedure SourceMarksGetSynEdit(Sender: TObject; aFilename: string;
var aSynEdit: TSynEdit);
// goto dialog
function GotoDialog: TfrmGoto;
@ -2706,7 +2705,7 @@ Begin
{$ENDIF}
end;
function TSourceEditCompletion.OnSynCompletionPaintItem(const AKey: string;
function TSourceEditCompletion.SynCompletionPaintItem(const AKey: string;
ACanvas: TCanvas; X, Y: integer; ItemSelected: boolean; Index: integer): boolean;
var
MaxX: Integer;
@ -2761,7 +2760,7 @@ begin
end;
end;
function TSourceEditCompletion.OnSynCompletionMeasureItem(const AKey: string;
function TSourceEditCompletion.SynCompletionMeasureItem(const AKey: string;
ACanvas: TCanvas; ItemSelected: boolean; Index: integer): TPoint;
var
MaxX: Integer;
@ -2798,7 +2797,7 @@ begin
end;
end;
procedure TSourceEditCompletion.OnSynCompletionSearchPosition(
procedure TSourceEditCompletion.SynCompletionSearchPosition(
var APosition: integer);
// prefix changed -> filter list
var
@ -2877,7 +2876,7 @@ begin
SrcEditHintWindow.UpdateHints;
end;
procedure TSourceEditCompletion.OnSynCompletionCompletePrefix(Sender: TObject);
procedure TSourceEditCompletion.SynCompletionCompletePrefix(Sender: TObject);
var
OldPrefix: String;
NewPrefix: String;
@ -2920,7 +2919,7 @@ begin
end;
end;
procedure TSourceEditCompletion.OnSynCompletionNextChar(Sender: TObject);
procedure TSourceEditCompletion.SynCompletionNextChar(Sender: TObject);
var
NewPrefix: String;
Line: String;
@ -2943,7 +2942,7 @@ begin
CurrentString:=NewPrefix;
end;
procedure TSourceEditCompletion.OnSynCompletionPrevChar(Sender: TObject);
procedure TSourceEditCompletion.SynCompletionPrevChar(Sender: TObject);
var
NewPrefix: String;
NewLen: LongInt;
@ -2958,7 +2957,7 @@ begin
CurrentString:=NewPrefix;
end;
procedure TSourceEditCompletion.OnSynCompletionKeyPress(Sender: TObject;
procedure TSourceEditCompletion.SynCompletionKeyPress(Sender: TObject;
var Key: Char);
begin
if (System.Pos(Key,EndOfTokenChr)>0) then begin
@ -2970,7 +2969,7 @@ begin
end;
end;
procedure TSourceEditCompletion.OnSynCompletionUTF8KeyPress(Sender: TObject;
procedure TSourceEditCompletion.SynCompletionUTF8KeyPress(Sender: TObject;
var UTF8Key: TUTF8Char);
begin
if (length(UTF8Key)=1)
@ -2984,7 +2983,7 @@ begin
//debugln('TSourceNotebook.OnSynCompletionKeyPress B UTF8Key=',dbgstr(UTF8Key));
end;
procedure TSourceEditCompletion.OnSynCompletionPositionChanged(Sender: TObject);
procedure TSourceEditCompletion.SynCompletionPositionChanged(Sender: TObject);
begin
if Manager.ActiveCompletionPlugin<>nil then
Manager.ActiveCompletionPlugin.IndexChanged(Position);
@ -3055,15 +3054,15 @@ begin
OnExecute := @ccExecute;
OnCancel := @ccCancel;
OnCodeCompletion := @ccComplete;
OnPaintItem:=@OnSynCompletionPaintItem;
OnMeasureItem := @OnSynCompletionMeasureItem;
OnSearchPosition:=@OnSynCompletionSearchPosition;
OnKeyCompletePrefix:=@OnSynCompletionCompletePrefix;
OnKeyNextChar:=@OnSynCompletionNextChar;
OnKeyPrevChar:=@OnSynCompletionPrevChar;
OnKeyPress:=@OnSynCompletionKeyPress;
OnUTF8KeyPress:=@OnSynCompletionUTF8KeyPress;
OnPositionChanged:=@OnSynCompletionPositionChanged;
OnPaintItem:=@SynCompletionPaintItem;
OnMeasureItem := @SynCompletionMeasureItem;
OnSearchPosition:=@SynCompletionSearchPosition;
OnKeyCompletePrefix:=@SynCompletionCompletePrefix;
OnKeyNextChar:=@SynCompletionNextChar;
OnKeyPrevChar:=@SynCompletionPrevChar;
OnKeyPress:=@SynCompletionKeyPress;
OnUTF8KeyPress:=@SynCompletionUTF8KeyPress;
OnPositionChanged:=@SynCompletionPositionChanged;
ShortCut:=Menus.ShortCut(VK_UNKNOWN,[]);
TheForm.ShowSizeDrag := True;
TheForm.Width := Max(50, EnvironmentGuiOpts.Desktop.CompletionWindowWidth);
@ -3784,7 +3783,7 @@ var
begin
SynAction:=raCancel;
SourceNotebook.BringToFront;
OnReplace(Sender, ASearch, AReplace, Line, Column, SynAction);
ReplaceTxtHandler(Sender, ASearch, AReplace, Line, Column, SynAction);
case SynAction of
raSkip: Action:=seraSkip;
raReplaceAll: Action:=seraReplaceAll;
@ -3915,7 +3914,7 @@ begin
until not Again;
end;
procedure TSourceEditor.OnReplace(Sender: TObject; const ASearch, AReplace:
procedure TSourceEditor.ReplaceTxtHandler(Sender: TObject; const ASearch, AReplace:
string; Line, Column: integer; var Action: TSynReplaceAction);
function Shorten(const s: string): string;
@ -4928,7 +4927,7 @@ begin
ShowHelpOrErrorForSourcePosition(Filename,FEditor.LogicalCaretXY);
end;
procedure TSourceEditor.OnEditorSpecialLineColor(Sender: TObject; Line: integer;
procedure TSourceEditor.EditorSpecialLineColor(Sender: TObject; Line: integer;
var Special: boolean; Markup: TSynSelectedColor);
var
i:integer;
@ -5289,8 +5288,8 @@ Begin
OnProcessCommand := @ProcessCommand;
OnProcessUserCommand := @ProcessUserCommand;
OnCommandProcessed := @UserCommandProcessed;
OnReplaceText := @OnReplace;
OnSpecialLineMarkup := @OnEditorSpecialLineColor;
OnReplaceText := @ReplaceTxtHandler;
OnSpecialLineMarkup := @EditorSpecialLineColor;
OnMouseMove := @EditorMouseMoved;
OnMouseWheel := @EditorMouseWheel;
OnMouseDown := @EditorMouseDown;
@ -7234,14 +7233,14 @@ begin
RegisterIDEMenuCommand(
RegisterIDEMenuSection(M as TIDEMenuSection, 'Open lpk sect '+TIDEPackage(M.UserTag).Filename),
'Open lpk '+TIDEPackage(M.UserTag).Filename,
lisCompPalOpenPackage, @OnPopupOpenPackageFile, nil, nil, '', M.UserTag);
lisCompPalOpenPackage, @PopupOpenPackageFile, nil, nil, '', M.UserTag);
end;
end;
if ProjMenu.Visible then begin
RegisterIDEMenuCommand(
RegisterIDEMenuSection(ProjMenu, 'Open proj sect '),
'Open proj', lisOpenProject2, @OnPopupOpenProjectInsp);
'Open proj', lisOpenProject2, @PopupOpenProjectInsp);
end;
end;
@ -7257,7 +7256,7 @@ var
begin
Result:=nil;
if ANewOnClick=nil then
ANewOnClick:=@OnPopupMenuOpenFile;
ANewOnClick:=@PopupMenuOpenFile;
if Filename='' then
Filename:=CurFilename;
Filename:=ChangeFileExt(Filename,ASuffix);
@ -7313,7 +7312,7 @@ begin
AddContextPopupMenuItem(
Format(lisOpenLfm,
[CreateRelativePath(CurFilename,ExtractFilePath(ASrcEdit.Filename))]),
true,@OnPopupMenuOpenFile);
true,@PopupMenuOpenFile);
end;
if FilenameHasPascalExt(ShortFileName) then begin
MaybeAddPopup('.lfm');
@ -7329,14 +7328,14 @@ begin
MaybeAddPopup('.p');
end;
if FilenameExtIn(ShortFileName, ['lpi','lpk'], true) then begin
AddContextPopupMenuItem(Format(lisOpenLfm,[ShortFileName]),true,@OnPopupMenuOpenFile);
AddContextPopupMenuItem(Format(lisOpenLfm,[ShortFileName]),true,@PopupMenuOpenFile);
end;
FPDocSrc:=LazarusHelp.GetFPDocFilenameForSource(CurFilename,false,AnOwner);
if FPDocSrc<>'' then
AddContextPopupMenuItem(
Format(lisOpenLfm,
[CreateRelativePath(FPDocSrc,ExtractFilePath(CurFilename))]),
true,@OnPopupMenuOpenFile);
true,@PopupMenuOpenFile);
end;
EditorPopupPoint:=EditorComp.ScreenToClient(SrcPopUpMenu.PopupPoint);
@ -8432,7 +8431,7 @@ begin
end;
end;
procedure TSourceNotebook.OnPopupMenuOpenFile(Sender: TObject);
procedure TSourceNotebook.PopupMenuOpenFile(Sender: TObject);
var
ResStr: String;
p: SizeInt;
@ -8458,7 +8457,7 @@ begin
[ofOnlyIfExists,ofAddToRecent,ofRegularFile,ofUseCache,ofDoNotLoadResource]);
end;
procedure TSourceNotebook.OnPopupOpenPackageFile(Sender: TObject);
procedure TSourceNotebook.PopupOpenPackageFile(Sender: TObject);
begin
if (Sender as TIDEMenuItem).UserTag <> 0 then begin
PackageEditingInterface.DoOpenPackageFile
@ -8466,7 +8465,7 @@ begin
end;
end;
procedure TSourceNotebook.OnPopupOpenProjectInsp(Sender: TObject);
procedure TSourceNotebook.PopupOpenProjectInsp(Sender: TObject);
begin
MainIDEInterface.DoShowProjectInspector;
end;
@ -8602,12 +8601,12 @@ begin
if ASrcEdit=nil then exit;
ASrcEdit.ShowBreakpointProps(ASrcEdit.EditorComponent.CaretY);
end;
{
procedure TSourceNotebook.CompleteCodeMenuItemClick(Sender: TObject);
begin
MainIDEInterface.DoCommand(ecCompleteCode);
end;
}
procedure TSourceNotebook.DeleteBreakpointClicked(Sender: TObject);
var
ASrcEdit: TSourceEditor;
@ -8617,7 +8616,7 @@ begin
DebugBoss.DoDeleteBreakPoint(ASrcEdit.Filename,
ASrcEdit.EditorComponent.CaretY);
end;
{
procedure TSourceNotebook.ExtractProcMenuItemClick(Sender: TObject);
begin
MainIDEInterface.DoCommand(ecExtractProc);
@ -8651,14 +8650,14 @@ procedure TSourceNotebook.ShowUnusedUnitsMenuItemClick(Sender: TObject);
begin
MainIDEInterface.DoCommand(ecRemoveUnusedUnits);
end;
}
procedure TSourceNotebook.SourceNotebookDropFiles(Sender: TObject;
const FileNames: array of String);
begin
FManager.ActiveSourceWindow := Self;
LazarusIDE.DoDropFiles(Sender,Filenames,WindowID);
end;
{
procedure TSourceNotebook.FindOverloadsMenuItemClick(Sender: TObject);
begin
MainIDEInterface.DoCommand(ecFindOverloads);
@ -8668,7 +8667,7 @@ procedure TSourceNotebook.MakeResourceStringMenuItemClick(Sender: TObject);
begin
MainIDEInterface.DoCommand(ecMakeResourceString);
end;
}
function TSourceNotebook.NewFile(const NewShortName: String;
ASource: TCodeBuffer; FocusIt: boolean; AShareEditor: TSourceEditor = nil): TSourceEditor;
var
@ -8937,7 +8936,7 @@ begin
Exit;
Result := FNotebook.IndexOf(TCustomPage(FHistoryList.Items[0]));
end;
{
procedure TSourceNotebook.InsertCharacter(const C: TUTF8Char);
var
FActiveEdit: TSourceEditor;
@ -8949,7 +8948,7 @@ begin
FActiveEdit.EditorComponent.InsertTextAtCaret(C);
end;
end;
}
procedure TSourceNotebook.SrcEditMenuCopyToExistingWindowClicked(Sender: TObject);
begin
inc(FFocusLock);
@ -8983,12 +8982,12 @@ begin
Manager.ActiveEditor := DestWin.Editors[SharedEditorIdx];
Manager.ShowActiveWindowOnTop(True);
end;
{
procedure TSourceNotebook.EditorLockClicked(Sender: TObject);
begin
GetActiveSE.IsLocked := not GetActiveSE.IsLocked;
end;
}
procedure TSourceNotebook.UpdateStatusBar;
var
tempEditor: TSourceEditor;
@ -11576,7 +11575,7 @@ begin
FHints.ActivateHint(ScreenRect, BaseURL, TheHint, AutoShown, AMouseOffset);
end;
procedure TSourceEditorManager.OnCodeTemplateTokenNotFound(Sender: TObject;
procedure TSourceEditorManager.CodeTemplateTokenNotFound(Sender: TObject;
AToken: string; AnEditor: TCustomSynEdit; var Index: integer);
begin
if Index=0 then ;
@ -11592,7 +11591,7 @@ begin
end;
end;
procedure TSourceEditorManager.OnCodeTemplateExecuteCompletion(
procedure TSourceEditorManager.CodeTemplateExecuteCompletion(
ASynAutoComplete: TCustomSynAutoComplete; Index: integer);
var
SrcEdit: TSourceEditorInterface;
@ -11629,7 +11628,7 @@ begin
end;
end;
procedure TSourceEditorManager.OnSourceCompletionTimer(Sender: TObject);
procedure TSourceEditorManager.SourceCompletionTimer(Sender: TObject);
function CheckCodeAttribute (XY: TPoint; out CodeAttri: String): Boolean;
var
@ -11708,7 +11707,7 @@ begin
end;
end;
procedure TSourceEditorManager.OnSourceMarksAction(AMark: TSourceMark;
procedure TSourceEditorManager.SourceMarksAction(AMark: TSourceMark;
AAction: TMarksAction);
var
Editor: TSourceEditor;
@ -11724,7 +11723,7 @@ begin
Editor.UpdateExecutionSourceMark;
end;
procedure TSourceEditorManager.OnSourceMarksGetSynEdit(Sender: TObject;
procedure TSourceEditorManager.SourceMarksGetSynEdit(Sender: TObject;
aFilename: string; var aSynEdit: TSynEdit);
var
SrcEdit: TSourceEditor;
@ -11765,7 +11764,7 @@ begin
AutoEnabled := False;
Enabled := false;
Interval := EditorOpts.AutoDelayInMSec;
OnTimer := @OnSourceCompletionTimer;
OnTimer := @SourceCompletionTimer;
end;
// timer for syncing codetools changes to synedit
@ -11782,8 +11781,8 @@ begin
// marks
SourceEditorMarks:=TSourceMarks.Create(Self);
SourceEditorMarks.OnAction:=@OnSourceMarksAction;
SourceEditorMarks.ExtToolsMarks.OnGetSynEditOfFile:=@OnSourceMarksGetSynEdit;
SourceEditorMarks.OnAction:=@SourceMarksAction;
SourceEditorMarks.ExtToolsMarks.OnGetSynEditOfFile:=@SourceMarksGetSynEdit;
// HintWindow
FHints := TSourceEditorHintWindowManager.Create(Self);
@ -11796,8 +11795,8 @@ begin
EditorOpts.LoadCodeTemplates(FCodeTemplateModul);
with FCodeTemplateModul do begin
IndentToTokenStart := EditorOpts.CodeTemplateIndentToTokenStart;
OnTokenNotFound := @OnCodeTemplateTokenNotFound;
OnExecuteCompletion := @OnCodeTemplateExecuteCompletion;
OnTokenNotFound := @CodeTemplateTokenNotFound;
OnExecuteCompletion := @CodeTemplateExecuteCompletion;
EndOfTokenChr:=' ()[]{},.;:"+-*^@$\<>=''';
end;

2
lcl/comctrls.pp
View File

@ -3471,7 +3471,7 @@ type
procedure HintMouseLeave(Sender: TObject);
procedure ImageListChange(Sender: TObject);
function NodeIsSelected(aNode: TTreeNode): Boolean;
procedure OnChangeTimer(Sender: TObject);
procedure ChangeTimer(Sender: TObject);
procedure SetAutoExpand(Value: Boolean);
procedure SetBackgroundColor(Value: TColor);
procedure SetBottomItem(Value: TTreeNode);

6
lcl/customdrawncontrols.pas
View File

@ -310,7 +310,7 @@ type
FItems: TStrings;
FKeyboardInputBehavior: TKeyboardInputBehavior;
function GetItems: TStrings;
procedure OnShowSelectItemDialogResult(ASelectedItem: Integer);
procedure ShowSelectItemDialogResult(ASelectedItem: Integer);
procedure SetItemIndex(AValue: Integer);
procedure SetItems(AValue: TStrings);
procedure SetKeyboardInputBehavior(AValue: TKeyboardInputBehavior);
@ -977,7 +977,7 @@ begin
Result := FItems;
end;
procedure TCDComboBox.OnShowSelectItemDialogResult(ASelectedItem: Integer);
procedure TCDComboBox.ShowSelectItemDialogResult(ASelectedItem: Integer);
begin
SetItemIndex(ASelectedItem);
end;
@ -1050,7 +1050,7 @@ begin
if (X > Width - Height) then
begin
// Call the combobox dialog
LCLIntf.OnShowSelectItemDialogResult := @OnShowSelectItemDialogResult;
LCLIntf.OnShowSelectItemDialogResult := @ShowSelectItemDialogResult;
LCLIntf.ShowSelectItemDialog(FItems, Self.ClientToScreen(Point(Left, Top+Height)));
Exit;

42
lcl/extdlgs.pas
View File

@ -201,13 +201,13 @@ type
okButton: TButton;
cancelButton: TButton;
panel: TPanel;
procedure OnDialogClose(Sender: TObject; var CloseAction: TCloseAction);
procedure OnDialogCloseQuery(Sender : TObject; var CanClose : boolean);
procedure OnDialogShow(Sender: TObject);
procedure OnCalendarDayChanged(Sender: TObject);
procedure OnCalendarMonthChanged(Sender: TObject);
procedure OnCalendarYearChanged(Sender: TObject);
procedure OnCalendarChange(Sender: TObject);
procedure DialogClose(Sender: TObject; var CloseAction: TCloseAction);
procedure DialogCloseQuery(Sender : TObject; var CanClose : boolean);
procedure DialogShow(Sender: TObject);
procedure CalendarDayChanged(Sender: TObject);
procedure CalendarMonthChanged(Sender: TObject);
procedure CalendarYearChanged(Sender: TObject);
procedure CalendarChange(Sender: TObject);
protected
class procedure WSRegisterClass; override;
procedure GetNewDate(Sender:TObject);//or onClick
@ -726,14 +726,14 @@ begin
Result := rsPickDate;
end;
procedure TCalendarDialog.OnDialogClose(Sender: TObject;
procedure TCalendarDialog.DialogClose(Sender: TObject;
var CloseAction: TCloseAction);
begin
//if Assigned(OnClose) then OnClose(Self);
DoClose;
end;
procedure TCalendarDialog.OnDialogCloseQuery(Sender: TObject;
procedure TCalendarDialog.DialogCloseQuery(Sender: TObject;
var CanClose: boolean);
begin
//if Assigned(OnCanClose) then OnCanClose(Sender, CanClose);
@ -744,7 +744,7 @@ begin
DoCanClose(CanClose);
end;
procedure TCalendarDialog.OnDialogShow(Sender: TObject);
procedure TCalendarDialog.DialogShow(Sender: TObject);
var
frm: TForm;
NBtnSize, NSpace, NCalSize: integer;
@ -786,25 +786,25 @@ begin
DoShow;
end;
procedure TCalendarDialog.OnCalendarDayChanged(Sender: TObject);
procedure TCalendarDialog.CalendarDayChanged(Sender: TObject);
begin
GetNewDate(Self);
if Assigned(FDayChanged) then FDayChanged(Self);
end;
procedure TCalendarDialog.OnCalendarMonthChanged(Sender: TObject);
procedure TCalendarDialog.CalendarMonthChanged(Sender: TObject);
begin
GetNewDate(Self);
if Assigned(FMonthChanged) then FMonthChanged(Self);
end;
procedure TCalendarDialog.OnCalendarYearChanged(Sender: TObject);
procedure TCalendarDialog.CalendarYearChanged(Sender: TObject);
begin
GetNewDate(Self);
if Assigned(FYearChanged) then FYearChanged(Self);
end;
procedure TCalendarDialog.OnCalendarChange(Sender: TObject);
procedure TCalendarDialog.CalendarChange(Sender: TObject);
begin
//Date already updated in OnCalendarXXXChanged
if Assigned(FOnChange) then FOnChange(Self);
@ -841,9 +841,9 @@ begin
DlgForm.BorderStyle:=bsDialog;
DlgForm.AutoScroll:=false;
DlgForm.AutoSize:=true;
DlgForm.OnShow := @OnDialogShow;
DlgForm.OnClose:=@OnDialogClose;
DlgForm.OnCloseQuery:=@OnDialogCloseQuery;
DlgForm.OnShow :=@DialogShow;
DlgForm.OnClose:=@DialogClose;
DlgForm.OnCloseQuery:=@DialogCloseQuery;
FCalendar:=TCalendar.Create(DlgForm);
with FCalendar do begin
@ -852,10 +852,10 @@ begin
DateTime:=Self.Date;
TabStop:=True;
DisplaySettings:=Self.DisplaySettings;
OnDayChanged:=@Self.OnCalendarDayChanged;
OnMonthChanged:=@Self.OnCalendarMonthChanged;
OnYearChanged:=@Self.OnCalendarYearChanged;
OnChange:=@Self.OnCalendarChange;
OnDayChanged:=@CalendarDayChanged;
OnMonthChanged:=@CalendarMonthChanged;
OnYearChanged:=@CalendarYearChanged;
OnChange:=@CalendarChange;
OnDblClick:=@CalendarDblClick;
end;

4
lcl/include/menuitem.inc
View File

@ -296,8 +296,8 @@ begin
Click;
end
else
if Assigned(DesignerMenuItemClick) then
DesignerMenuItemClick(Self);
if Assigned(OnDesignerMenuItemClick) then
OnDesignerMenuItemClick(Self);
end;
function TMenuItem.DoDrawItem(ACanvas: TCanvas; ARect: TRect;

4
lcl/include/treeview.inc
View File

@ -3429,7 +3429,7 @@ begin
FChangeTimer := TTimer.Create(Self);
FChangeTimer.Enabled := False;
FChangeTimer.Interval := 1;
FChangeTimer.OnTimer := @OnChangeTimer;
FChangeTimer.OnTimer := @ChangeTimer;
FImageChangeLink := TChangeLink.Create;
FImageChangeLink.OnChange := @ImageListChange;
FSelectedColor:=clHighlight;
@ -4477,7 +4477,7 @@ begin
FTopItem := Value;
end;
procedure TCustomTreeView.OnChangeTimer(Sender: TObject);
procedure TCustomTreeView.ChangeTimer(Sender: TObject);
begin
FChangeTimer.Enabled := False;
//debugln('TCustomTreeView.OnChangeTimer');

2
lcl/menus.pp
View File

@ -486,8 +486,8 @@ procedure ShortCutToKey(const ShortCut : TShortCut; out Key: Word;
out Shift : TShiftState);
var
DesignerMenuItemClick: TNotifyEvent = nil;
ActivePopupMenu: TPopupMenu = nil;
OnDesignerMenuItemClick: TNotifyEvent = nil;
OnMenuPopupHandler: TNotifyEvent = nil;
function NewMenu(Owner: TComponent; const AName: string;

6
packager/packagedefs.pas
View File

@ -573,7 +573,7 @@ type
procedure SetStorePathDelim(const AValue: TPathDelimSwitch);
procedure SetUseLegacyLists(const AUseLegacyLists: Boolean);
procedure SetUserReadOnly(const AValue: boolean);
procedure OnMacroListSubstitution({%H-}TheMacro: TTransferMacro;
procedure MacroListSubstitution({%H-}TheMacro: TTransferMacro;
const MacroName: string; var s: string;
const Data: PtrInt; var Handled, {%H-}Abort: boolean; {%H-}Depth: integer);
procedure Clear;
@ -2131,7 +2131,7 @@ end;
{ TLazPackage }
procedure TLazPackage.OnMacroListSubstitution(TheMacro: TTransferMacro;
procedure TLazPackage.MacroListSubstitution(TheMacro: TTransferMacro;
const MacroName: string; var s: string; const Data: PtrInt;
var Handled, Abort: boolean; Depth: integer);
var
@ -2631,7 +2631,7 @@ begin
FFiles:=TFPList.Create;
FRemovedFiles:=TFPList.Create;
FMacros:=TTransferMacroList.Create;
FMacros.OnSubstitution:=@OnMacroListSubstitution;
FMacros.OnSubstitution:=@MacroListSubstitution;
FIDEOptions:=TPackageIDEOptions.Create(Self);
FLazCompilerOptions:=TPkgCompilerOptions.Create(Self);
CompilerOptions.ParsedOpts.InvalidateParseOnChange:=true;