diff --git a/lcl/editbtn.pas b/lcl/editbtn.pas index 03829f73c0..9eee231f83 100644 --- a/lcl/editbtn.pas +++ b/lcl/editbtn.pas @@ -169,7 +169,7 @@ type procedure RunDialog; virtual; public constructor Create(AOwner: TComponent); override; - Destructor Destroy; override; + destructor Destroy; override; property DialogFiles : TStrings read FDialogFiles; published // TFileName properties. @@ -248,7 +248,7 @@ type procedure RunDialog; virtual; public constructor Create(AOwner: TComponent); override; - Destructor Destroy; override; + destructor Destroy; override; published // TDirectory properties. property Directory : String read GetDirectory write SetDirectory; @@ -410,7 +410,7 @@ type procedure RunDialog; virtual; public constructor Create(AOwner: TComponent); override; - Destructor Destroy; override; + destructor Destroy; override; published // CalcEdit properties property CalculatorLayout : TCalculatorLayout read FLayout write Flayout; diff --git a/lcl/include/bevel.inc b/lcl/include/bevel.inc index dc61eed4a4..16ac1d216b 100644 --- a/lcl/include/bevel.inc +++ b/lcl/include/bevel.inc @@ -13,20 +13,20 @@ * * ***************************************************************************** } -Constructor TBevel.Create(AOwner:TComponent); -Begin +constructor TBevel.Create(AOwner:TComponent); +begin Inherited Create(AOwner); ControlStyle:=ControlStyle-[csSetCaption,csOpaque]; FStyle:=bsLowered; FShape:=bsBox; SetBounds(0,0,50,50); -End; +end; -Destructor TBevel.Destroy; -Begin +destructor TBevel.Destroy; +begin Inherited Destroy; -End; +end; procedure TBevel.Assign(Source: TPersistent); begin @@ -39,37 +39,37 @@ begin end; procedure TBevel.Invalidate; -Begin +begin if Canvas.HandleAllocated then Paint; -End; +end; function TBevel.GetStyle:TBevelStyle; -Begin +begin Result:=FStyle; -End; +end; procedure TBevel.SetStyle(aStyle:TBevelStyle); -Begin +begin If FStyle<>aStyle Then - Begin + begin FStyle:=aStyle; Invalidate; - End; -End; + end; +end; function TBevel.GetShape:TBevelShape; -Begin +begin Result := FShape; -End; +end; procedure TBevel.SetShape(aShape:TBevelShape); -Begin - If FShape<>aShape Then - Begin +begin + if FShape<>aShape then + begin FShape:=aShape; Invalidate; - End; -End; + end; +end; procedure TBevel.Paint; Var diff --git a/lcl/include/checkbox.inc b/lcl/include/checkbox.inc index 05a6a56bfa..cf0bd8cbb8 100644 --- a/lcl/include/checkbox.inc +++ b/lcl/include/checkbox.inc @@ -409,7 +409,7 @@ begin PaintText(PaintRect); end; -Constructor TCheckbox.Create(AOwner: TComponent); +constructor TCheckbox.Create(AOwner: TComponent); begin inherited Create(AOwner); controlstyle := controlstyle - [csAcceptsControls]; diff --git a/lcl/include/promptdialog.inc b/lcl/include/promptdialog.inc index 39c2c9a5dc..81b410a750 100644 --- a/lcl/include/promptdialog.inc +++ b/lcl/include/promptdialog.inc @@ -208,7 +208,7 @@ begin LayoutDialog; end; -Destructor TPromptDialog.Destroy; +destructor TPromptDialog.Destroy; begin FBitmap.Free; inherited destroy; diff --git a/lcl/include/screen.inc b/lcl/include/screen.inc index 352176be77..7b7e845cbb 100644 --- a/lcl/include/screen.inc +++ b/lcl/include/screen.inc @@ -49,7 +49,7 @@ end; Destructor for the class. ------------------------------------------------------------------------------} -Destructor TScreen.Destroy; +destructor TScreen.Destroy; var HandlerType: TScreenNotification; begin diff --git a/lcl/interfaces/win32/win32listsl.inc b/lcl/interfaces/win32/win32listsl.inc index cd4ca0ee7f..51bfd497c7 100644 --- a/lcl/interfaces/win32/win32listsl.inc +++ b/lcl/interfaces/win32/win32listsl.inc @@ -37,10 +37,10 @@ Returns: ------------------------------------------------------------------------------} -Constructor TWin32ListStringList.Create(List : HWND; TheOwner: TWinControl); -Begin - Inherited Create; - If List = HWND(Nil) Then +constructor TWin32ListStringList.Create(List : HWND; TheOwner: TWinControl); +begin + inherited Create; + if List = HWND(nil) then Raise Exception.Create('Unspecified list window'); //Assert(False, 'Trace:Unspecified list window'); FWin32List := List; @@ -50,7 +50,7 @@ Begin InitFlags; // Determine if the list is sorted FSorted := (UINT(GetWindowLong(FWin32List, GWL_STYLE)) and FFlagSort <> 0); -End; +end; procedure TWin32ListStringList.InitFlags; begin diff --git a/lcl/interfaces/wince/wincelistsl.inc b/lcl/interfaces/wince/wincelistsl.inc index 12e55335f8..b26b9eee22 100644 --- a/lcl/interfaces/wince/wincelistsl.inc +++ b/lcl/interfaces/wince/wincelistsl.inc @@ -64,10 +64,10 @@ end; Returns: ------------------------------------------------------------------------------} -Constructor TWinCEListStringList.Create(List : HWND; TheOwner: TWinControl); -Begin - Inherited Create; - If List = HWND(Nil) Then +constructor TWinCEListStringList.Create(List : HWND; TheOwner: TWinControl); +begin + inherited Create; + if List = HWND(nil) then Raise Exception.Create('Unspecified list window'); //Assert(False, 'Trace:Unspecified list window'); FWinCEList := List; @@ -77,7 +77,7 @@ Begin InitFlags; // Determine if the list is sorted FSorted := (UINT(GetWindowLong(FWinCEList, GWL_STYLE)) and FFlagSort <> 0); -End; +end; procedure TWinCEListStringList.InitFlags; begin