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

* Merge branch 'lazarus-typos' into 'main'

Browse Source 
See merge request freepascal.org/lazarus/lazarus!331
This commit is contained in:
Martin 2024-09-23 12:44:57 +02:00
commit a0913a8b50
17 changed files with 59 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/buildintf/compoptsintf.pas
View File

@ -200,7 +200,7 @@ type
procedure SetStopAfterErrCount(const AValue: integer);
procedure SetStripSymbols(const AValue: Boolean);
procedure SetSyntaxMode(const AValue: string);
procedure SetTargetFilenameAppplyConventions(const AValue: boolean);
procedure SetTargetFilenameApplyConventions(const AValue: boolean);
procedure SetTrashVariables(const AValue: Boolean);
procedure SetUncertainOpt(const AValue: Boolean);
procedure SetUseAnsiStr(const AValue: Boolean);
@ -271,7 +271,7 @@ type
FUseExternalDbgSyms : Boolean;
fTargetFileExt: string;
fTargetFilename: string;
FTargetFilenameAppplyConventions: boolean;
FTargetFilenameApplyConventions: boolean;
// Messages:
fShowWarn: Boolean;
fShowNotes: Boolean;
@ -392,7 +392,7 @@ type
// target:
property TargetFileExt: string read FTargetFileExt write SetTargetFileExt; // empty for default
property TargetFilename: string read fTargetFilename write SetTargetFilename; // empty for default
property TargetFilenameApplyConventions: boolean read FTargetFilenameAppplyConventions write SetTargetFilenameAppplyConventions;
property TargetFilenameApplyConventions: boolean read FTargetFilenameApplyConventions write SetTargetFilenameApplyConventions;
// parsing:
property SyntaxMode: string read FSyntaxMode write SetSyntaxMode;
@ -890,11 +890,11 @@ begin
IncreaseChangeStamp;
end;
procedure TLazCompilerOptions.SetTargetFilenameAppplyConventions(
procedure TLazCompilerOptions.SetTargetFilenameApplyConventions(
const AValue: boolean);
begin
if FTargetFilenameAppplyConventions=AValue then exit;
FTargetFilenameAppplyConventions:=AValue;
if FTargetFilenameApplyConventions=AValue then exit;
FTargetFilenameApplyConventions:=AValue;
IncreaseChangeStamp;
end;
@ -1001,7 +1001,7 @@ begin
fOnChanged:=TMethodList.Create;
FChangeStamp:=InvalidChangeStamp;
FSavedChangeStamp:=FChangeStamp;
FTargetFilenameAppplyConventions:=true;
FTargetFilenameApplyConventions:=true;
FOwner := TheOwner;
end;

19
components/ideintf/idewindowintf.pas
View File

@ -243,11 +243,12 @@ type
end;
{ TSimpleWindowLayoutList }
TLayoutMoveToVisbleMode = (
TLayoutMoveToVisibleMode = (
vmAlwaysMoveToVisible,
vmNeverMoveToVisible,
vmOnlyMoveOffScreenToVisible // Only make visible, if offscreen (with a threshold)
);
TLayoutMoveToVisbleMode = TLayoutMoveToVisibleMode deprecated 'Use "TLayoutMoveToVisibleMode" / Will be removed in 4.99';
TSimpleWindowLayoutList = class
private
@ -262,7 +263,7 @@ type
procedure Delete(Index: Integer);
procedure ApplyAndShow(Sender: TObject; AForm: TCustomForm;
BringToFront: boolean;
AMoveToVisbleMode: TLayoutMoveToVisbleMode = vmOnlyMoveOffScreenToVisible);
AMoveToVisibleMode: TLayoutMoveToVisibleMode = vmOnlyMoveOffScreenToVisible);
procedure StoreWindowPositions;
procedure SetDefaultPosition(const AForm: TCustomForm);
procedure MoveToTop(const AFormID: string);
@ -413,7 +414,7 @@ type
function GetForm(aFormName: string; AutoCreate: boolean;
DisableAutoSizing: boolean = false): TCustomForm;
procedure ShowForm(AForm: TCustomForm; BringToFront: boolean;
AMoveToVisbleMode: TLayoutMoveToVisbleMode = vmOnlyMoveOffScreenToVisible); overload;
AMoveToVisibleMode: TLayoutMoveToVisibleMode = vmOnlyMoveOffScreenToVisible); overload;
function ShowForm(AFormName: string; BringToFront: boolean): TCustomForm; overload;
procedure CreateForm(var AForm; AFormClass: TCustomFormClass;
DoDisableAutoSizing: boolean; TheOwner: TComponent); // utility function to create a form with delayed autosizing
@ -1694,12 +1695,12 @@ begin
end;
procedure TSimpleWindowLayoutList.ApplyAndShow(Sender: TObject; AForm: TCustomForm;
BringToFront: boolean; AMoveToVisbleMode: TLayoutMoveToVisbleMode);
BringToFront: boolean; AMoveToVisibleMode: TLayoutMoveToVisibleMode);
procedure AdjustShowing;
begin
if (AMoveToVisbleMode = vmAlwaysMoveToVisible)
or ((AMoveToVisbleMode = vmOnlyMoveOffScreenToVisible) and IsFormStatic(AForm))
if (AMoveToVisibleMode = vmAlwaysMoveToVisible)
or ((AMoveToVisibleMode = vmOnlyMoveOffScreenToVisible) and IsFormStatic(AForm))
then
AForm.MakeFullyVisible(nil, True);
AForm.ShowOnTop;
@ -1797,7 +1798,7 @@ begin
NewBounds.Right:=Max(NewBounds.Left+100,NewBounds.Right);
NewBounds.Bottom:=Max(NewBounds.Top+100,NewBounds.Bottom);
AForm.BoundsRect:=NewBounds;
AMoveToVisbleMode := vmOnlyMoveOffScreenToVisible;
AMoveToVisibleMode := vmOnlyMoveOffScreenToVisible;
end;
finally
// do not change Visible property while designing form. issue #20602
@ -2238,7 +2239,7 @@ begin
end;
procedure TIDEWindowCreatorList.ShowForm(AForm: TCustomForm; BringToFront: boolean;
AMoveToVisbleMode: TLayoutMoveToVisbleMode);
AMoveToVisibleMode: TLayoutMoveToVisibleMode);
var
Layout: TSimpleWindowLayout;
begin
@ -2262,7 +2263,7 @@ begin
if (IDETabMaster <> nil) and IsFormDesign(AForm) then
IDETabMaster.ShowForm(AForm)
else
SimpleLayoutStorage.ApplyAndShow(Self,AForm,BringToFront,AMoveToVisbleMode);
SimpleLayoutStorage.ApplyAndShow(Self,AForm,BringToFront,AMoveToVisibleMode);
end;
function TIDEWindowCreatorList.ShowForm(AFormName: string; BringToFront: boolean): TCustomForm;

18
components/synedit/lazsynedittext.pas
View File

@ -507,7 +507,8 @@ type
procedure AddEditHandler(AHandler: TStringListLineEditEvent);
procedure RemoveEditHandler(AHandler: TStringListLineEditEvent);
procedure RemoveHanlders(AOwner: TObject);
procedure RemoveHanlders(AOwner: TObject); deprecated 'Use "RemoveHandlers" / Will be removed in 4.99';
procedure RemoveHandlers(AOwner: TObject);
//function GetPhysicalCharWidths(Line: PChar; LineLen, Index: Integer): TPhysicalCharWidths; override;
property NextLines: TSynEditStrings read fSynStrings write SetSynStrings;
@ -548,7 +549,7 @@ type
protected
procedure AddManagedHandler(AReason: TSynEditNotifyReason; AHandler: TMethod); virtual; abstract;
procedure RemoveManagedHandler(AReason: TSynEditNotifyReason; AHandler: TMethod); virtual; abstract;
procedure RemoveManagedHanlders(AOwner: TObject); virtual; abstract;
procedure RemoveManagedHandlers(AOwner: TObject); virtual; abstract;
end;
{ TSynTextViewsManager }
@ -567,7 +568,7 @@ type
protected
procedure AddGenericHandler(AReason: TSynEditNotifyReason; AHandler: TMethod);
procedure RemoveGenericHandler(AReason: TSynEditNotifyReason; AHandler: TMethod);
procedure RemoveHanlders(AOwner: TObject);
procedure RemoveHandlers(AOwner: TObject);
property TextBuffer: TSynEditStringListBase read FTextBuffer write SetTextBuffer;
public
constructor Create(ATextBuffer: TSynEditStringListBase; ATopViewChangedCallback: TNotifyEvent);
@ -1786,7 +1787,12 @@ end;
procedure TSynEditStringsLinked.RemoveHanlders(AOwner: TObject);
begin
Manager.RemoveHanlders(AOwner);
RemoveHandlers(AOwner);
end;
procedure TSynEditStringsLinked.RemoveHandlers(AOwner: TObject);
begin
Manager.RemoveHandlers(AOwner);
end;
function TSynEditStringsLinked.LogicPosAddChars(const ALine: String; ALogicalPos,
@ -1941,14 +1947,14 @@ begin
FTextBuffer.RemoveManagedHandler(AReason, AHandler);
end;
procedure TSynTextViewsManager.RemoveHanlders(AOwner: TObject);
procedure TSynTextViewsManager.RemoveHandlers(AOwner: TObject);
var
i: TSynEditNotifyReason;
begin
for i := low(TSynEditNotifyReason) to high(TSynEditNotifyReason) do
FNotifyLists[i].RemoveAllMethodsOfObject(AOwner);
if FTextBuffer <> nil then
FTextBuffer.RemoveManagedHanlders(AOwner);
FTextBuffer.RemoveManagedHandlers(AOwner);
end;
constructor TSynTextViewsManager.Create(ATextBuffer: TSynEditStringListBase;

2
components/synedit/synbeautifierpascal.pas
View File

@ -804,7 +804,7 @@ begin
CommentStartsAtBOL := GetCommentStartCol = 1 + GetIndentForLine(nil, CurrentLines[ToIdx(GetFirstCommentLine)], False);
// Aply indent before prefix
// Apply indent before prefix
if Matching or (FCommentMode[FoldTyp] = sccPrefixAlways) or (sciApplyIndentForNoMatch in FIndentMode[FoldTyp])
then begin
IndentTypeBackup := IndentType;

2
components/synedit/synedit.pp
View File

@ -2050,7 +2050,7 @@ end;
function TCustomSynEdit.RowToScreenRow(PhysicalRow: integer): integer;
// returns -1 for lines above visible screen (<TopLine)
// 0 for the first line
// 0 to LinesInWindow for visible lines (incl last partial visble line)
// 0 to LinesInWindow for visible lines (incl last partial visible line)
// and returns LinesInWindow+1 for lines below visible screen
begin
Result := ToPos(FTheLinesView.TextToViewIndex(ToIdx(PhysicalRow))) - TopView;

6
components/synedit/syneditfoldedview.pp
View File

@ -3642,7 +3642,7 @@ begin
if not assigned(hl) then
exit(0);
// AStartIndex is 0-based
// FoldTree is 1-based AND first line remains visble
// FoldTree is 1-based AND first line remains visible
c := hl.FoldNodeInfo[AStartIndex].CountEx([sfaOpen, sfaFold]);
if c = 0 then
exit(-1);
@ -4001,7 +4001,7 @@ begin
top := TopTextIndex;
// AStartIndex is 0-based
// FoldTree is 1-based AND first line remains visble
// FoldTree is 1-based AND first line remains visible
NodeCount := FoldProvider.FoldOpenCount(AStartIndex);
if ColCount = 0 then
ColCount := NodeCount;
@ -4170,7 +4170,7 @@ begin
c := hl.FoldBlockOpeningCount(i) -1;
fldinf := FoldProvider.InfoForFoldAtTextIndex(i, c);
// i is 0-based
// FoldTree is 1-based AND first line remains visble
// FoldTree is 1-based AND first line remains visible
fFoldTree.InsertNewFold(i+2, c, fldinf.Column, fldinf.ColumnLen, fldinf.LineCount, 1,
fldinf.Classification, fldinf.FoldTypeCompatible); // TODO: hide too? currently VisibleLines=1
if IgnoreNested then

14
components/synedit/synedittextbuffer.pp
View File

@ -214,7 +214,7 @@ type
AHandler: TMethod); override;
procedure RemoveManagedHandler(AReason: TSynEditNotifyReason;
AHandler: TMethod); override;
procedure RemoveManagedHanlders(AOwner: TObject); override;
procedure RemoveManagedHandlers(AOwner: TObject); override;
public
constructor Create;
destructor Destroy; override;
@ -241,7 +241,8 @@ type
procedure DetachSynEdit(AEdit: TSynEditBase);
function AttachedSynEditCount: Integer;
property AttachedSynEdits[Index: Integer]: TSynEditBase read GetAttachedSynEdits;
procedure CopyHanlders(OtherLines: TSynEditStringList; AOwner: TObject = nil);
procedure CopyHanlders(OtherLines: TSynEditStringList; AOwner: TObject = nil); deprecated 'Use "CopyHandlers" / Will be removed in 4.99';
procedure CopyHandlers(OtherLines: TSynEditStringList; AOwner: TObject = nil);
procedure SendCachedNotify; // ToDO: review caching versus changes to topline and other values
public
property DosFileFormat: boolean read fDosFileFormat write fDosFileFormat;
@ -1047,6 +1048,11 @@ begin
Result := FAttachedSynEditList.Count;
end;
procedure TSynEditStringList.CopyHanlders(OtherLines: TSynEditStringList; AOwner: TObject);
begin
CopyHandlers(OtherLines, AOwner);
end;
function TSynEditStringList.GetObject(Index: integer): TObject;
begin
if (Index >= 0) and (Index < Count) then
@ -1366,7 +1372,7 @@ begin
FNotifyLists[AReason].Remove(AHandler);
end;
procedure TSynEditStringList.CopyHanlders(OtherLines: TSynEditStringList; AOwner: TObject = nil);
procedure TSynEditStringList.CopyHandlers(OtherLines: TSynEditStringList; AOwner: TObject = nil);
var
i: TSynEditNotifyReason;
begin
@ -1374,7 +1380,7 @@ begin
FNotifyLists[i].AddCopyFrom(OtherLines.FNotifyLists[i], AOwner);
end;
procedure TSynEditStringList.RemoveManagedHanlders(AOwner: TObject);
procedure TSynEditStringList.RemoveManagedHandlers(AOwner: TObject);
var
i: TSynEditNotifyReason;
begin

2
components/synedit/synguttercodefolding.pp
View File

@ -477,7 +477,7 @@ end;
destructor TSynGutterCodeFolding.Destroy;
begin
CaretObj.RemoveChangeHandler(@CaretChanged);
ViewedTextBuffer.RemoveHanlders(self);
ViewedTextBuffer.RemoveHandlers(self);
FreeAndNil(FMarkupInfoCurrentFold);
FreeAndNil(FMarkupInfoCurrentFoldInternal);
FreeAndNil(FMouseActionsCollapsed);

2
components/synedit/syngutterlinenumber.pp
View File

@ -94,7 +94,7 @@ end;
destructor TSynGutterLineNumber.Destroy;
begin
ViewedTextBuffer.RemoveHanlders(self);
ViewedTextBuffer.RemoveHandlers(self);
FTextDrawer.UnRegisterOnFontChangeHandler(@FontChanged);
inherited Destroy;
end;

6
components/synedit/syngutterlineoverview.pp
View File

@ -1128,7 +1128,7 @@ end;
destructor TSynGutterLOvProviderModifiedLines.Destroy;
begin
ViewedTextBuffer.RemoveHanlders(self);
ViewedTextBuffer.RemoveHandlers(self);
SynEdit.UnRegisterStatusChangedHandler(@SynStatusChanged);
inherited Destroy;
end;
@ -1264,7 +1264,7 @@ end;
destructor TSynGutterLOvProviderBookmarks.Destroy;
begin
ViewedTextBuffer.RemoveHanlders(self);
ViewedTextBuffer.RemoveHandlers(self);
(SynEdit.Marks as TSynEditMarkList).UnRegisterChangeHandler(@DoMarkChange);
inherited Destroy;
end;
@ -1304,7 +1304,7 @@ end;
destructor TSynGutterLineOverview.Destroy;
begin
Application.RemoveAsyncCalls(Self);
ViewedTextBuffer.RemoveHanlders(self);
ViewedTextBuffer.RemoveHandlers(self);
FreeAndNil(FProviders);
FreeAndNil(FWinControl);
FreeAndNil(FLineMarks);

2
docs/xml/lcl/grids.xml
View File

@ -2260,7 +2260,7 @@ changed.
</short>
<descr>
<p>
Calls the inherited method on entry to signal assigned OnVisbleChanging event
Calls the inherited method on entry to signal assigned OnVisibleChanging event
handlers in the control or form hierarchy. Updates the Visible property in
each of the editor controls to match the property value in the
TCompositeCellEditor instance. When displaying the editor controls, their

2
ide/frames/compiler_path_options.pas
View File

@ -723,7 +723,7 @@ begin
UnitOutputDirEdit.Text := FCompilerOpts.UnitOutputDirectory;
SetPathTextAndHint(FCompilerOpts.DebugPath, DebugPathEdit);
chkUseAsDefault.Visible := FCompilerOpts.CanBeDefaulForProject;
chkUseAsDefault.Visible := FCompilerOpts.CanBeDefaultForProject;
end;
procedure TCompilerPathOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions);

6
ide/packages/ideconfig/compileroptions.pp
View File

@ -328,7 +328,7 @@ type
): string; virtual;
function GetDefaultMainSourceFileName: string; virtual;
function GetDefaultWriteConfigFilePath: string; virtual; abstract;
function CanBeDefaulForProject: boolean; virtual;
function CanBeDefaultForProject: boolean; virtual;
function NeedsLinkerOpts: boolean;
function HasCommands: boolean; // true if there is at least one commad to execute
function HasCompilerCommand: boolean; virtual;
@ -1867,7 +1867,7 @@ begin
Result:='';
end;
function TBaseCompilerOptions.CanBeDefaulForProject: boolean;
function TBaseCompilerOptions.CanBeDefaultForProject: boolean;
begin
Result:=false;
end;
@ -3055,7 +3055,7 @@ begin
// target
if Done(Tool.AddDiff('TargetFileExt',fTargetFileExt,CompOpts.fTargetFileExt)) then exit;
if Done(Tool.AddDiff('TargetFilename',fTargetFilename,CompOpts.fTargetFilename)) then exit;
if Done(Tool.AddDiff('TargetFilenameAppplyConventions',FTargetFilenameAppplyConventions,CompOpts.FTargetFilenameAppplyConventions)) then exit;
if Done(Tool.AddDiff('TargetFilenameApplyConventions',FTargetFilenameApplyConventions,CompOpts.FTargetFilenameApplyConventions)) then exit;
// search paths
if Tool<>nil then Tool.Path:='Paths';

4
ide/packages/ideproject/project.pp
View File

@ -574,7 +574,7 @@ type
procedure Clear; override;
procedure LoadFromXMLConfig(AXMLConfig: TXMLConfig; const Path: string); override;
procedure SaveToXMLConfig(AXMLConfig: TXMLConfig; const Path: string); override;
function CanBeDefaulForProject: boolean; override;
function CanBeDefaultForProject: boolean; override;
function GetOwnerName: string; override;
function GetDefaultMainSourceFileName: string; override;
function GetDefaultWriteConfigFilePath: string; override;
@ -6661,7 +6661,7 @@ begin
inherited Clear;
end;
function TProjectCompilerOptions.CanBeDefaulForProject: boolean;
function TProjectCompilerOptions.CanBeDefaultForProject: boolean;
begin
Result:=true;
end;

2
ide/sourcesyneditor.pas
View File

@ -2172,7 +2172,7 @@ end;
destructor TIDESynGutterLOvProviderPascal.Destroy;
begin
ViewedTextBuffer.RemoveHanlders(self);
ViewedTextBuffer.RemoveHandlers(self);
inherited Destroy;
end;

2
lcl/interfaces/gtk3/gtk3widgets.pas
View File

@ -4521,7 +4521,7 @@ begin
FPageLabel:= TGtkLabel.new(PChar(Params.Caption));
FPageLabel^.set_use_underline(true);
Self.FHasPaint:=true;
// ref it to save it in case TabVisble is set to false
// ref it to save it in case TabVisible is set to false
FPageLabel^.ref;
Result := TGtkHBox.new(GTK_ORIENTATION_HORIZONTAL, 0);
FCentralWidget := TGtkFixed.new;

2
test/lcltests/testpagecontrol.pas
View File

@ -820,7 +820,7 @@ begin
s3.TabVisible := False;
Application.ProcessMessages;
// TabRect takes an indek into VISBLE-only tabs
// TabRect takes an indek into VISIBLE-only tabs
T2Recta := PageControl.TabRect(2); // the old tab 2, since tab3 is hidden
T2RectaScr.TopLeft := PageControl.ClientToScreen(T2Recta.TopLeft);
T2RectaScr.BottomRight := PageControl.ClientToScreen(T2Recta.BottomRight);