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

lcl: formatting, cleanup

Browse Source 
git-svn-id: trunk@26773 -
This commit is contained in:
paul 2010-07-22 08:19:41 +00:00
parent 9d66578778
commit df4dcb0147
2 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lcl/include/wincontrol.inc
View File

@ -5613,50 +5613,45 @@ var
ShiftState: TShiftState;
AParent: TWinControl;
begin
Result:=true;
Result := True;
ShiftState := KeyDataToShiftState(Message.KeyData);
// check popup menu
if Assigned(FPopupMenu) then
begin
if FPopupMenu.IsShortCut(Message) then
exit;
end;
if Assigned(FPopupMenu) and FPopupMenu.IsShortCut(Message) then
Exit;
// let each parent form handle shortcuts
AParent:=Parent;
while (AParent<>nil) do begin
if (AParent is TCustomForm) then begin
if TCustomForm(AParent).IsShortcut(Message) then
exit;
end;
AParent:=AParent.Parent;
AParent := Parent;
while Assigned(AParent) do
begin
if (AParent is TCustomForm) and TCustomForm(AParent).IsShortcut(Message) then
Exit;
AParent := AParent.Parent;
end;
// let application handle shortcut
if Assigned(Application) and Application.IsShortcut(Message) then
exit;
Exit;
// let parent(s) handle key from child key
if Assigned(Parent) then
if Parent.ChildKey(Message) then
exit;
if Assigned(Parent) and Parent.ChildKey(Message) then
Exit;
// handle LCL special keys
ControlKeyDown(Message.CharCode,ShiftState);
if Message.CharCode=VK_UNKNOWN then exit;
ControlKeyDown(Message.CharCode, ShiftState);
if Message.CharCode = VK_UNKNOWN then Exit;
//DebugLn('TWinControl.WMKeyDown ',Name,':',ClassName);
if not (csNoStdEvents in ControlStyle) then
begin
KeyDownAfterInterface(Message.CharCode, ShiftState);
if Message.CharCode=VK_UNKNOWN then exit;
if Message.CharCode = VK_UNKNOWN then Exit;
// Note: Message.CharCode can now be different or even 0
end;
// let application handle the remaining key
if Application<>nil then
if Assigned(Application) then
Application.NotifyKeyDownHandler(Self, Message.CharCode, ShiftState);
if Message.CharCode = VK_UNKNOWN then Exit;

2
lcl/interfaces/win32/win32callback.inc
View File

@ -1514,7 +1514,7 @@ begin
WM_GETDLGCODE:
begin
LMessage.Result := DLGC_WANTALLKEYS;
WinProcess := false;
WinProcess := False;
end;
WM_HELP:
begin