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

LCL: Rename function NewLine -> NewLineMI to avoid name clashes and confusion.

Browse Source 
git-svn-id: trunk@58939 -
This commit is contained in:
juha 2018-09-10 22:27:55 +00:00
parent 49e55e3acf
commit 508a89d4af
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/ideintf/objectinspector.pp
View File

@ -5666,7 +5666,7 @@ var
// insert the separator // insert the separator
if VerbCount > 0 then if VerbCount > 0 then
begin begin
PropertyEditorVerbSeparator := Menus.NewLine; PropertyEditorVerbSeparator := Menus.NewLineMI;
PropertyEditorVerbSeparator.Name := PropertyEditorMIPrefix + IntToStr(VerbCount); PropertyEditorVerbSeparator.Name := PropertyEditorMIPrefix + IntToStr(VerbCount);
MainPopupMenu.Items.Insert(VerbCount, PropertyEditorVerbSeparator); MainPopupMenu.Items.Insert(VerbCount, PropertyEditorVerbSeparator);
end; end;
@ -5699,7 +5699,7 @@ var
// insert the separator // insert the separator
if VerbCount > 0 then if VerbCount > 0 then
begin begin
ComponentEditorVerbSeparator := Menus.NewLine; ComponentEditorVerbSeparator := Menus.NewLineMI;
ComponentEditorVerbSeparator.Name := ComponentEditorMIPrefix + IntToStr(VerbCount); ComponentEditorVerbSeparator.Name := ComponentEditorMIPrefix + IntToStr(VerbCount);
MainPopupMenu.Items.Insert(VerbCount, ComponentEditorVerbSeparator); MainPopupMenu.Items.Insert(VerbCount, ComponentEditorVerbSeparator);
end; end;
@ -5712,7 +5712,7 @@ var
Item := NewItem(oisAddCollectionItem, 0, False, True, Item := NewItem(oisAddCollectionItem, 0, False, True,
@CollectionAddItem, 0, ComponentEditorMIPrefix+'0'); @CollectionAddItem, 0, ComponentEditorMIPrefix+'0');
MainPopupMenu.Items.Insert(0, Item); MainPopupMenu.Items.Insert(0, Item);
ComponentEditorVerbSeparator := NewLine; ComponentEditorVerbSeparator := NewLineMI;
ComponentEditorVerbSeparator.Name := ComponentEditorMIPrefix+'1'; ComponentEditorVerbSeparator.Name := ComponentEditorMIPrefix+'1';
MainPopupMenu.Items.Insert(1, ComponentEditorVerbSeparator); MainPopupMenu.Items.Insert(1, ComponentEditorVerbSeparator);
end; end;
@ -5742,7 +5742,7 @@ var
MainPopupMenu.Items.Insert(ComponentEditorVerbSeparator.MenuIndex + 1, ZItem) MainPopupMenu.Items.Insert(ComponentEditorVerbSeparator.MenuIndex + 1, ZItem)
else else
MainPopupMenu.Items.Insert(0, ZItem); MainPopupMenu.Items.Insert(0, ZItem);
Item := NewLine; Item := NewLineMI;
Item.Name := ComponentEditorMIPrefix+'ZOrderSeparator'; Item.Name := ComponentEditorMIPrefix+'ZOrderSeparator';
MainPopupMenu.Items.Insert(ZItem.MenuIndex + 1, Item); MainPopupMenu.Items.Insert(ZItem.MenuIndex + 1, Item);
end; end;

4
lcl/menus.pp
View File

@ -460,7 +460,7 @@ function NewSubMenu(const ACaption: string; hCtx: THelpContext;
function NewItem(const ACaption: string; AShortCut: TShortCut; function NewItem(const ACaption: string; AShortCut: TShortCut;
AChecked, TheEnabled: Boolean; TheOnClick: TNotifyEvent; AChecked, TheEnabled: Boolean; TheOnClick: TNotifyEvent;
hCtx: THelpContext; const AName: string): TMenuItem; hCtx: THelpContext; const AName: string): TMenuItem;
function NewLine: TMenuItem; function NewLineMI: TMenuItem;
function StripHotkey(const Text: string): string; function StripHotkey(const Text: string): string;
@ -609,7 +609,7 @@ begin
end; end;
end; end;
function NewLine: TMenuItem; function NewLineMI: TMenuItem;
begin begin
Result := TMenuItem.Create(nil); Result := TMenuItem.Create(nil);
Result.Caption := cLineCaption; Result.Caption := cLineCaption;