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

Merged revision(s) 52703 #a55241308e from trunk:

Browse Source 
revert r52494, r52500 #48fe37a204: they caused crashes in Carbon interface. Issue #30003
........

git-svn-id: branches/fixes_1_6@52721 -
This commit is contained in:
maxim 2016-07-19 22:21:24 +00:00
parent 01f30a52b8
commit ad3e1137d9
3 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lcl/controls.pp
View File

@ -297,7 +297,6 @@ type
FWindowHandle: HWND;
procedure SetControl(AControl: TControl);
protected
procedure SetHandle(NewHandle: HDC); override;
procedure CreateHandle; override;
function GetDefaultColor(const ADefaultColorType: TDefaultColorType): TColor; override;
public

9
lcl/include/controlcanvas.inc
View File

@ -27,13 +27,6 @@ begin
end;
end;
procedure TControlCanvas.SetHandle(NewHandle: HDC);
begin
if NewHandle=0 then // don't allow to clear handle if there's valid FDeviceContext - otherwise it doesn't get freed!
NewHandle := FDeviceContext;
inherited SetHandle(NewHandle);
end;
function TControlCanvas.GetDefaultColor(const ADefaultColorType: TDefaultColorType): TColor;
begin
if Assigned(FControl) then
@ -119,12 +112,12 @@ end;
------------------------------------------------------------------------------}
procedure TControlCanvas.FreeHandle;
begin
inherited;
if FDeviceContext <> 0 then
begin
ReleaseDC(FWindowHandle, FDeviceContext);
FDeviceContext := 0;
end;
inherited;
end;
function TControlCanvas.ControlIsPainting: boolean;

9
lcl/include/wincontrol.inc
View File

@ -6310,7 +6310,6 @@ end;
procedure TWinControl.RemoveControl(AControl: TControl);
var
AWinControl: TWinControl;
AGrControl: TGraphicControl;
begin
DisableAutoSizing{$IFDEF DebugDisableAutoSizing}('TWinControl.RemoveControl'){$ENDIF};
try
@ -6323,16 +6322,8 @@ begin
AWinControl.DestroyHandle;
end
else
begin
if AControl is TGraphicControl then
begin
AGrControl := TGraphicControl(AControl);
if (AGrControl.Canvas<>nil) and AGrControl.Canvas.HandleAllocated then
TControlCanvas(AGrControl.Canvas).FreeHandle;
end;
if HandleAllocated then
AControl.InvalidateControl(AControl.IsVisible, False, True);
end;
Remove(AControl);
Perform(CM_CONTROLLISTCHANGE, WParam(AControl), LParam(False));
if not (csDestroying in ComponentState) then