diff --git a/lcl/forms.pp b/lcl/forms.pp index 94728b88c9..92f7d8956f 100644 --- a/lcl/forms.pp +++ b/lcl/forms.pp @@ -326,8 +326,6 @@ type FClientHandle: HWND; FDummyPPI : longint; public - constructor Create(AOwner: TComponent); override; - destructor Destroy; override; property ClientHandle: HWND read FClientHandle; published property PixelsPerInch : Longint read FDummyPPI write FDummyPPI stored False; @@ -738,7 +736,6 @@ end; {$I scrollingwincontrol.inc} {$I scrollbox.inc} -{$I form.inc} {$I customform.inc} {$I screen.inc} {$I application.inc} diff --git a/lcl/include/customform.inc b/lcl/include/customform.inc index c27ccae341..736aa687fe 100644 --- a/lcl/include/customform.inc +++ b/lcl/include/customform.inc @@ -107,6 +107,11 @@ begin //writeln('[TCustomForm.Destroy] A ',Name,':',ClassName); if not (csDestroying in ComponentState) then ;//GlobalNameSpace.BeginWrite; try + // ------ + // Temp hack to get Beforedestruction called + // FPC1.0.x doesn't call itself before destruction + {$IFDEF VER1_0}BeforeDestruction;{$ENDIF} + // ------ FMenu.Free; FMenu:=nil; FCanvas.Free; @@ -1165,6 +1170,11 @@ end; { ============================================================================= $Log$ + Revision 1.67 2002/10/27 15:46:58 lazarus + MWE: + * Moved call to BeforeDestruction to CustomForm + - Removed form.inc + Revision 1.66 2002/10/27 11:51:35 lazarus MG: fixed memleaks