lcl: formatting

git-svn-id: trunk@28173 -
This commit is contained in:
paul 2010-11-10 06:32:07 +00:00
parent 9bd782a63e
commit 3a9c1584fa

View File

@ -2161,25 +2161,28 @@ var
ParentForm: TCustomForm; ParentForm: TCustomForm;
DC: HDC; DC: HDC;
begin begin
if FPixelsPerInch=0 then begin if FPixelsPerInch = 0 then
if Parent<>nil then begin begin
ParentForm:=GetParentForm(Self); if Assigned(Parent) then
if ParentForm<>nil then begin begin
FPixelsPerInch:=ParentForm.PixelsPerInch; ParentForm := GetParentForm(Self);
end; if Assigned(ParentForm) then
FPixelsPerInch := ParentForm.PixelsPerInch;
end; end;
if FPixelsPerInch<=0 then begin if FPixelsPerInch <= 0 then
if HandleAllocated then begin begin
DC:=GetDC(Handle); if HandleAllocated then
FPixelsPerInch:=GetDeviceCaps(DC,LOGPIXELSX); begin
ReleaseDC(Handle,DC); DC := GetDC(Handle);
end else begin FPixelsPerInch := GetDeviceCaps(DC, LOGPIXELSX);
FPixelsPerInch:=Screen.PixelsPerInch; ReleaseDC(Handle, DC);
end; end
else
FPixelsPerInch := Screen.PixelsPerInch;
end; end;
end; end;
Result:=FPixelsPerInch; Result := FPixelsPerInch;
end; end;
function TCustomForm.GetMonitor: TMonitor; function TCustomForm.GetMonitor: TMonitor;
@ -2476,10 +2479,10 @@ end;
procedure TCustomForm.CreateWnd; procedure TCustomForm.CreateWnd;
begin begin
//DebugLn('TCustomForm.CreateWnd START ',ClassName); //DebugLn('TCustomForm.CreateWnd START ',ClassName);
FFormState:=FFormState-[fsBorderStyleChanged,fsFormStyleChanged]; FFormState := FFormState - [fsBorderStyleChanged, fsFormStyleChanged];
inherited CreateWnd; inherited CreateWnd;
FPixelsPerInch:=0; FPixelsPerInch := 0;
Assert(False, 'Trace:[TCustomForm.CreateWnd] FMenu.HandleNeeded'); Assert(False, 'Trace:[TCustomForm.CreateWnd] FMenu.HandleNeeded');
UpdateMenu; UpdateMenu;