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

Merged revision(s) 59760 #78f99157f2 from trunk:

Browse Source 
LCL: Rename function NewLineMI back to NewLine for Delphi-compatibility. Issue .
........

git-svn-id: branches/fixes_2_0@59768 -
This commit is contained in:
maxim 2018-12-09 22:40:19 +00:00
parent f57361106e
commit ca0776b930
3 changed files with 7 additions and 14 deletions
components
ideintf
objectinspector.pp
virtualtreeview
VTHeaderPopup.pas
lcl
menus.pp

8
components/ideintf/objectinspector.pp
View File

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

2
components/virtualtreeview/VTHeaderPopup.pas
View File

@ -191,7 +191,7 @@ begin
if poResizeToFitItem in Self.Options then begin
NewMenuItem := NewItem(sResizeToFit, 0, False, True, OnMenuItemClick, 0, cResizeToFitMenuItemName);
Items.Add(NewMenuItem);
Items.Add(NewLineMI());
Items.Add(NewLine());
end;//poResizeToFitItem
// Add column menu items.

11
lcl/menus.pp
View File

@ -460,8 +460,7 @@ function NewSubMenu(const ACaption: string; hCtx: THelpContext;
function NewItem(const ACaption: string; AShortCut: TShortCut;
AChecked, TheEnabled: Boolean; TheOnClick: TNotifyEvent;
hCtx: THelpContext; const AName: string): TMenuItem;
function NewLineMI: TMenuItem;
function NewLine: TMenuItem; deprecated 'Use function NewLineMI instead.';
function NewLine: TMenuItem;
function StripHotkey(const Text: string): string;
@ -610,18 +609,12 @@ begin
end;
end;
function NewLineMI: TMenuItem;
function NewLine: TMenuItem;
begin
Result := TMenuItem.Create(nil);
Result.Caption := cLineCaption;
end;
function NewLine: TMenuItem;
// Deprecated because the name clashes with so many variables around Lazarus code.
begin
Result := NewLineMI;
end;
function StripHotkey(const Text: string): string;
var
I, R: Integer;