paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-27 17:53:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL: reverted accidental commits of r15706 #d49446d842

Browse Source 
git-svn-id: trunk@15707 -
This commit is contained in:
vincents 2008-07-08 16:48:59 +00:00
parent d49446d842
commit 4ee45a7631
4 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lcl/include/listitem.inc
View File

@ -321,7 +321,6 @@ end;
{------------------------------------------------------------------------------}
procedure TListItem.Delete;
begin
DebugLn(['TListItem.Delete ', Caption, 'lifDestroying in FFlags: ', lifDestroying in FFlags]);
if not (lifDestroying in FFlags) then Free;
end;
@ -330,7 +329,6 @@ end;
{------------------------------------------------------------------------------}
destructor TListItem.Destroy;
begin
DebugLn(['TListItem.Destroy', Caption]);
Include(FFlags, lifDestroying);
if FOwner <> nil
then FOwner.ItemDestroying(Self);

1
lcl/include/listitems.inc
View File

@ -189,7 +189,6 @@ begin
if FCacheIndex = idx
then FCacheIndex := -1;
DebugLn([FItems.Count,' ', idx]);
FItems.Delete(idx);
end;

26
lcl/lclproc.pas
View File

@ -376,10 +376,29 @@ type
mkcDel, mkcShift, mkcCtrl, mkcAlt);
const
SmkcBkSp = 'BkSp';
SmkcTab = 'Tab';
SmkcEsc = 'Esc';
SmkcEnter = 'Enter';
SmkcSpace = 'Space';
SmkcPgUp = 'PgUp';
SmkcPgDn = 'PgDn';
SmkcEnd = 'End';
SmkcHome = 'Home';
SmkcLeft = 'Left';
SmkcUp = 'Up';
SmkcRight = 'Right';
SmkcDown = 'Down';
SmkcIns = 'Ins';
SmkcDel = 'Del';
SmkcShift = 'Shift+';
SmkcCtrl = 'Ctrl+';
SmkcAlt = 'Alt+';
MenuKeyCaps: array[TMenuKeyCap] of string = (
rssmkcBkSp, rssmkcTab, rssmkcEsc, rssmkcEnter, rssmkcSpace, rssmkcPgUp,
rssmkcPgDn, rssmkcEnd, rssmkcHome, rssmkcLeft, rssmkcUp, rssmkcRight,
rssmkcDown, rssmkcIns, rssmkcDel, rssmkcShift, rssmkcCtrl, rssmkcAlt);
SmkcBkSp, SmkcTab, SmkcEsc, SmkcEnter, SmkcSpace, SmkcPgUp,
SmkcPgDn, SmkcEnd, SmkcHome, SmkcLeft, SmkcUp, SmkcRight,
SmkcDown, SmkcIns, SmkcDel, SmkcShift, SmkcCtrl, SmkcAlt);
function GetSpecialShortCutName(ShortCut: TShortCut): string;
{var
@ -433,7 +452,6 @@ var
Name: string;
Key: Byte;
begin
MenuKeyCaps[mkcShift] := rssmkcShift;
Key := ShortCut and $FF;
case Key of
$08, $09:

20
lcl/lclstrconsts.pas
View File

@ -265,26 +265,6 @@ ResourceString
ifsVK_NUMPAD = 'Numpad %d';
ifsVK_NUMLOCK = 'Numlock';
ifsVK_SCROLL = 'Scroll';
// shortcut keys
rssmkcBkSp = 'BkSp';
rssmkcTab = 'Tab';
rssmkcEsc = 'Esc';
rssmkcEnter = 'Enter';
rssmkcSpace = 'Space';
rssmkcPgUp = 'PgUp';
rssmkcPgDn = 'PgDn';
rssmkcEnd = 'End';
rssmkcHome = 'Home';
rssmkcLeft = 'Left';
rssmkcUp = 'Up';
rssmkcRight = 'Right';
rssmkcDown = 'Down';
rssmkcIns = 'Ins';
rssmkcDel = 'Del';
rssmkcShift = 'Shift+';
rssmkcCtrl = 'Ctrl+';
rssmkcAlt = 'Alt+';
// docking
rsDocking = 'Docking';