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

fix no OnExit event, bug #13172. LCL messages should be sent using LCLMessageGlue unit

Browse Source 
git-svn-id: trunk@18727 -
This commit is contained in:
dmitry 2009-02-17 11:00:29 +00:00
parent 271dd47acb
commit b2fb7b1209
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lcl/interfaces/carbon/carbonprivatewindow.inc
View File

@ -888,7 +888,7 @@ function CarbonWindow_ActivateProc(ANextHandler: EventHandlerCallRef;
AEvent: EventRef;
AWidget: TCarbonWidget): OSStatus; {$IFDEF darwin}mwpascal;{$ENDIF}
var
Msg: TLMessage;
DoActivate: Boolean;
EventKind: UInt32;
Control: ControlRef;
FocusWidget: TCarbonControl;
@ -898,23 +898,21 @@ begin
{$ENDIF}
Result := CallNextEventHandler(ANextHandler, AEvent);
FillChar(Msg, SizeOf(Msg), 0);
EventKind := GetEventKind(AEvent);
case EventKind of
kEventWindowActivated:
begin
Msg.msg := LM_ACTIVATE;
DoActivate:=true;
if (AWidget.LCLObject is TCustomForm) then
CarbonWidgetSet.SetRootMenu((AWidget.LCLObject as TCustomForm).Menu);
end;
kEventWindowDeactivated: Msg.msg := LM_DEACTIVATE;
kEventWindowDeactivated: DoActivate:=false;
else
DebugLn('CarbonWindow_ActivateProc invalid event kind: ' + DbgS(EventKind));
Exit;
end;
DeliverMessage(AWidget.LCLObject, Msg);
LCLSendActivateMsg(AWidget.LCLObject, DoActivate, false);
// force set and kill focus of focused control
Control := nil;
@ -924,10 +922,8 @@ begin
FocusWidget := GetCarbonControl(Control);
if FocusWidget <> nil then
case Msg.msg of
LM_ACTIVATE: FocusWidget.FocusSet;
LM_DEACTIVATE: FocusWidget.FocusKilled;
end;
if DoActivate then FocusWidget.FocusSet
else FocusWidget.FocusKilled;
end;
end;