mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-08-13 23:49:13 +02:00
mainform may also be an MDI form, or a stay on top form (fixes bug #656)
git-svn-id: trunk@7044 -
This commit is contained in:
parent
3d07b12402
commit
cdcf64b178
@ -1404,7 +1404,7 @@ begin
|
|||||||
|
|
||||||
if (Instance is TForm) then begin
|
if (Instance is TForm) then begin
|
||||||
AForm:=TForm(Instance);
|
AForm:=TForm(Instance);
|
||||||
if (FMainForm = nil) and (AForm.FormStyle=fsNormal) then begin
|
if (FMainForm = nil) and not (AForm.FormStyle in [fsMDIChild, fsSplash]) then begin
|
||||||
FMainForm := AForm;
|
FMainForm := AForm;
|
||||||
AForm.HandleNeeded;
|
AForm.HandleNeeded;
|
||||||
end else begin
|
end else begin
|
||||||
@ -1453,6 +1453,9 @@ end;
|
|||||||
{ =============================================================================
|
{ =============================================================================
|
||||||
|
|
||||||
$Log$
|
$Log$
|
||||||
|
Revision 1.113 2005/03/31 20:07:44 micha
|
||||||
|
mainform may also be an MDI form, or a stay on top form (fixes bug 656)
|
||||||
|
|
||||||
Revision 1.112 2005/03/26 11:24:55 micha
|
Revision 1.112 2005/03/26 11:24:55 micha
|
||||||
remove TApplication.Handle (not cross-platform)
|
remove TApplication.Handle (not cross-platform)
|
||||||
|
|
||||||
|
@ -239,7 +239,7 @@ begin
|
|||||||
Flags := BorderStyleToWin32Flags(BorderStyle);
|
Flags := BorderStyleToWin32Flags(BorderStyle);
|
||||||
FlagsEx := BorderStyleToWin32FlagsEx(BorderStyle);
|
FlagsEx := BorderStyleToWin32FlagsEx(BorderStyle);
|
||||||
if (lForm.FormStyle in fsAllStayOnTop) and
|
if (lForm.FormStyle in fsAllStayOnTop) and
|
||||||
(not (csDesigning in lForm.ComponentState)) then
|
not (csDesigning in lForm.ComponentState) then
|
||||||
FlagsEx := FlagsEx or WS_EX_TOPMOST;
|
FlagsEx := FlagsEx or WS_EX_TOPMOST;
|
||||||
Flags := Flags or CalcBorderIconsFlags(lForm);
|
Flags := Flags or CalcBorderIconsFlags(lForm);
|
||||||
pClassName := @ClsName;
|
pClassName := @ClsName;
|
||||||
|
Loading…
Reference in New Issue
Block a user