added class keyword to proc bodies for fpc 2.1.1

git-svn-id: trunk@9373 -
This commit is contained in:
vincents 2006-05-29 12:08:34 +00:00
parent 77ba6ead64
commit 6492115d91
8 changed files with 38 additions and 38 deletions

View File

@ -114,11 +114,11 @@ implementation
{$I carbonprivatecheckbox.inc} {$I carbonprivatecheckbox.inc}
// move to inc // move to inc
procedure TCarbonPrivateHandle.RegisterEvents(AInfo: PWidgetInfo); class procedure TCarbonPrivateHandle.RegisterEvents(AInfo: PWidgetInfo);
begin begin
end; end;
procedure TCarbonPrivateHandle.UnregisterEvents; class procedure TCarbonPrivateHandle.UnregisterEvents;
begin begin
end; end;

View File

@ -16,11 +16,11 @@
} }
procedure TCarbonPrivateCheckBox.RegisterEvents(AInfo: PWidgetInfo); class procedure TCarbonPrivateCheckBox.RegisterEvents(AInfo: PWidgetInfo);
begin begin
// do we call inherited(AInfo); here? // do we call inherited(AInfo); here?
end; end;
procedure TCarbonPrivateCheckBox.UnRegisterEvents; class procedure TCarbonPrivateCheckBox.UnRegisterEvents;
begin begin
end; end;

View File

@ -73,7 +73,7 @@ end;
{ TCarbonWSWinControlPrivate } { TCarbonWSWinControlPrivate }
(* (*
procedure TCarbonPrivateHiView.InstallControlHandler(AInfo: PWidgetInfo; AClass: UInt32; AKind: UInt32; AHandler: Pointer; var AUPP: EventHandlerUPP); class procedure TCarbonPrivateHiView.InstallControlHandler(AInfo: PWidgetInfo; AClass: UInt32; AKind: UInt32; AHandler: Pointer; var AUPP: EventHandlerUPP);
var var
eventSpec: EventTypeSpec; eventSpec: EventTypeSpec;
begin begin
@ -85,7 +85,7 @@ begin
end; end;
*) *)
procedure TCarbonPrivateHiView.RegisterEvents(AInfo: PWidgetInfo); class procedure TCarbonPrivateHiView.RegisterEvents(AInfo: PWidgetInfo);
var var
MouseSpec: array [0..6] of EventTypeSpec; MouseSpec: array [0..6] of EventTypeSpec;
TmpSpec: EventTypeSpec; TmpSpec: EventTypeSpec;
@ -110,7 +110,7 @@ begin
DebugLN(TWinControl(Ainfo^.LCLObject).Name,':', TWinControl(Ainfo^.LCLObject).ClassName ,' Events set') DebugLN(TWinControl(Ainfo^.LCLObject).Name,':', TWinControl(Ainfo^.LCLObject).ClassName ,' Events set')
end; end;
procedure TCarbonPrivateHiView.UnregisterEvents; class procedure TCarbonPrivateHiView.UnregisterEvents;
begin begin
UnregisterEventHandler(@CarbonPrivateHIView_Dispose); UnregisterEventHandler(@CarbonPrivateHIView_Dispose);
UnregisterEventHandler(@CarbonPrivateHIView_Hit); UnregisterEventHandler(@CarbonPrivateHIView_Hit);

View File

@ -819,7 +819,7 @@ end;
{ TCarbonPrivateWindow } { TCarbonPrivateWindow }
procedure TCarbonPrivateWindow.RegisterEvents(AInfo: PWidgetInfo); class procedure TCarbonPrivateWindow.RegisterEvents(AInfo: PWidgetInfo);
var var
MouseSpec: array [0..6] of EventTypeSpec; MouseSpec: array [0..6] of EventTypeSpec;
TmpSpec: EventTypeSpec; TmpSpec: EventTypeSpec;
@ -866,7 +866,7 @@ begin
3, @KeySpecs[0], Pointer(AInfo), nil); 3, @KeySpecs[0], Pointer(AInfo), nil);
end; end;
procedure TCarbonPrivateWindow.UnregisterEvents; class procedure TCarbonPrivateWindow.UnregisterEvents;
begin begin
UnregisterEventHandler(@CarbonPrivateWindow_Close); UnregisterEventHandler(@CarbonPrivateWindow_Close);
UnregisterEventHandler(@CarbonPrivateWindow_Closed); UnregisterEventHandler(@CarbonPrivateWindow_Closed);

View File

@ -69,7 +69,7 @@ implementation
{ TCarbonWSButton } { TCarbonWSButton }
function TCarbonWSButton.CreateHandle(const AWinControl: TWinControl; class function TCarbonWSButton.CreateHandle(const AWinControl: TWinControl;
const AParams: TCreateParams): TLCLIntfHandle; const AParams: TCreateParams): TLCLIntfHandle;
var var
//Button: TCustomButton; //Button: TCustomButton;

View File

@ -99,7 +99,7 @@ implementation
{ TCarbonWSWinControl } { TCarbonWSWinControl }
function TCarbonWSWinControl.GetText(const AWinControl: TWinControl; class function TCarbonWSWinControl.GetText(const AWinControl: TWinControl;
var AText: String): Boolean; var AText: String): Boolean;
var var
CFString: CFStringRef; CFString: CFStringRef;
@ -162,7 +162,7 @@ begin
end; end;
end; end;
procedure TCarbonWSWinControl.SetText(const AWinControl: TWinControl; class procedure TCarbonWSWinControl.SetText(const AWinControl: TWinControl;
const AText: String); const AText: String);
var var
CFString: CFStringRef; CFString: CFStringRef;
@ -178,7 +178,7 @@ begin
CFRelease(Pointer(CFString)); CFRelease(Pointer(CFString));
end; end;
procedure TCarbonWSWinControl.DestroyHandle(const AWinControl: TWinControl); class procedure TCarbonWSWinControl.DestroyHandle(const AWinControl: TWinControl);
begin begin
if not WSCheckHandleAllocated(AWincontrol, 'DestroyHandle') if not WSCheckHandleAllocated(AWincontrol, 'DestroyHandle')
then Exit; then Exit;
@ -187,7 +187,7 @@ begin
DisposeControl(ControlRef(AWinControl.Handle)); DisposeControl(ControlRef(AWinControl.Handle));
end; end;
function TCarbonWSWinControl.GetClientBounds(const AWincontrol: TWinControl; class function TCarbonWSWinControl.GetClientBounds(const AWincontrol: TWinControl;
var ARect: TRect): Boolean; var ARect: TRect): Boolean;
var var
AHiRect: HIRect; AHiRect: HIRect;
@ -200,7 +200,7 @@ begin
ARect.Bottom := ARect.Top + Trunc(AHIRect.size.height); ARect.Bottom := ARect.Top + Trunc(AHIRect.size.height);
end; end;
function TCarbonWSWinControl.GetClientRect(const AWincontrol: TWinControl; class function TCarbonWSWinControl.GetClientRect(const AWincontrol: TWinControl;
var ARect: TRect): Boolean; var ARect: TRect): Boolean;
var var
AHiRect: HIRect; AHiRect: HIRect;
@ -215,7 +215,7 @@ end;
{ TCarbonWSCustomControl } { TCarbonWSCustomControl }
function TCarbonWSCustomControl.CreateHandle(const AWinControl: TWinControl; class function TCarbonWSCustomControl.CreateHandle(const AWinControl: TWinControl;
const AParams: TCreateParams): TLCLIntfHandle; const AParams: TCreateParams): TLCLIntfHandle;
var var
//Button: TCustomButton; //Button: TCustomButton;

View File

@ -120,7 +120,7 @@ implementation
{ TCarbonWSCustomForm } { TCarbonWSCustomForm }
function TCarbonWSCustomForm.CreateHandle(const AWinControl: TWinControl; class function TCarbonWSCustomForm.CreateHandle(const AWinControl: TWinControl;
const AParams: TCreateParams): TLCLIntfHandle; const AParams: TCreateParams): TLCLIntfHandle;
var var
Window: FPCMacOSAll.WindowRef; Window: FPCMacOSAll.WindowRef;
@ -174,7 +174,7 @@ begin
ShowWindow(Window); ShowWindow(Window);
end; end;
procedure TCarbonWSCustomForm.DestroyHandle(const AWinControl: TWinControl); class procedure TCarbonWSCustomForm.DestroyHandle(const AWinControl: TWinControl);
begin begin
if not WSCheckHandleAllocated(AWincontrol, 'DestroyHandle') if not WSCheckHandleAllocated(AWincontrol, 'DestroyHandle')
then Exit; then Exit;
@ -182,7 +182,7 @@ begin
DisposeWindow(WindowRef(AWinControl.Handle)); DisposeWindow(WindowRef(AWinControl.Handle));
end; end;
procedure TCarbonWSCustomForm.SetText(const AWinControl: TWinControl; class procedure TCarbonWSCustomForm.SetText(const AWinControl: TWinControl;
const AText: String); const AText: String);
var var
CFString: CFStringRef; CFString: CFStringRef;

View File

@ -225,7 +225,7 @@ type
implementation implementation
function TCarbonWSCustomEdit.CreateHandle(const AWinControl: TWinControl; const AParams: TCreateParams): TLCLIntfHandle; class function TCarbonWSCustomEdit.CreateHandle(const AWinControl: TWinControl; const AParams: TCreateParams): TLCLIntfHandle;
var var
Edit: TCustomEdit; Edit: TCustomEdit;
Control: ControlRef; Control: ControlRef;
@ -262,7 +262,7 @@ begin
TCarbonPrivateHandleClass(WSPrivate).RegisterEvents(Info); TCarbonPrivateHandleClass(WSPrivate).RegisterEvents(Info);
end; end;
function TCarbonWSCustomEdit.GetSelStart(const ACustomEdit: TCustomEdit): integer; class function TCarbonWSCustomEdit.GetSelStart(const ACustomEdit: TCustomEdit): integer;
var var
Control: ControlRef; Control: ControlRef;
SelData: ControlEditTextSelectionRec; SelData: ControlEditTextSelectionRec;
@ -280,7 +280,7 @@ begin
Result := SelData.SelStart; Result := SelData.SelStart;
end; end;
function TCarbonWSCustomEdit.GetSelLength(const ACustomEdit: TCustomEdit): integer; class function TCarbonWSCustomEdit.GetSelLength(const ACustomEdit: TCustomEdit): integer;
var var
Control: ControlRef; Control: ControlRef;
SelData: ControlEditTextSelectionRec; SelData: ControlEditTextSelectionRec;
@ -298,7 +298,7 @@ begin
Result := SelData.SelEnd - SelData.SelStart; Result := SelData.SelEnd - SelData.SelStart;
end; end;
function TCarbonWSCustomEdit.GetText(const AWinControl: TWinControl; class function TCarbonWSCustomEdit.GetText(const AWinControl: TWinControl;
var AText: String): Boolean; var AText: String): Boolean;
var var
Control: ControlRef; Control: ControlRef;
@ -332,25 +332,25 @@ begin
AText := PChar(Str); AText := PChar(Str);
end; end;
procedure TCarbonWSCustomEdit.SetCharCase(const ACustomEdit: TCustomEdit; class procedure TCarbonWSCustomEdit.SetCharCase(const ACustomEdit: TCustomEdit;
NewCase: TEditCharCase); NewCase: TEditCharCase);
begin begin
// TODO // TODO
end; end;
procedure TCarbonWSCustomEdit.SetEchoMode(const ACustomEdit: TCustomEdit; class procedure TCarbonWSCustomEdit.SetEchoMode(const ACustomEdit: TCustomEdit;
NewMode: TEchoMode); NewMode: TEchoMode);
begin begin
//TODO //TODO
end; end;
procedure TCarbonWSCustomEdit.SetMaxLength(const ACustomEdit: TCustomEdit; class procedure TCarbonWSCustomEdit.SetMaxLength(const ACustomEdit: TCustomEdit;
NewLength: integer); NewLength: integer);
begin begin
//AFAICS this will have to be checked in a callback //AFAICS this will have to be checked in a callback
end; end;
procedure TCarbonWSCustomEdit.SetPasswordChar(const ACustomEdit: TCustomEdit; class procedure TCarbonWSCustomEdit.SetPasswordChar(const ACustomEdit: TCustomEdit;
NewChar: char); NewChar: char);
var var
NeedsPassword: Boolean; NeedsPassword: Boolean;
@ -370,7 +370,7 @@ begin
end; end;
procedure TCarbonWSCustomEdit.SetReadOnly(const ACustomEdit: TCustomEdit; class procedure TCarbonWSCustomEdit.SetReadOnly(const ACustomEdit: TCustomEdit;
NewReadOnly: boolean); NewReadOnly: boolean);
var var
Control: ControlRef; Control: ControlRef;
@ -384,7 +384,7 @@ begin
SizeOf(Boolean), @NewReadOnly); SizeOf(Boolean), @NewReadOnly);
end; end;
procedure TCarbonWSCustomEdit.SetSelStart(const ACustomEdit: TCustomEdit; NewStart: integer); class procedure TCarbonWSCustomEdit.SetSelStart(const ACustomEdit: TCustomEdit; NewStart: integer);
var var
Control: ControlRef; Control: ControlRef;
SelData: ControlEditTextSelectionRec; SelData: ControlEditTextSelectionRec;
@ -404,7 +404,7 @@ begin
end; end;
procedure TCarbonWSCustomEdit.SetSelLength(const ACustomEdit: TCustomEdit; NewLength: integer); class procedure TCarbonWSCustomEdit.SetSelLength(const ACustomEdit: TCustomEdit; NewLength: integer);
var var
Control: ControlRef; Control: ControlRef;
SelData: ControlEditTextSelectionRec; SelData: ControlEditTextSelectionRec;
@ -423,7 +423,7 @@ begin
end; end;
procedure TCarbonWSCustomEdit.SetText(const AWinControl: TWinControl; class procedure TCarbonWSCustomEdit.SetText(const AWinControl: TWinControl;
const AText: String); const AText: String);
var var
Control: ControlRef; Control: ControlRef;
@ -445,7 +445,7 @@ begin
CFRelease(Pointer(CFString)); CFRelease(Pointer(CFString));
end; end;
procedure TCarbonWSCustomEdit.GetPreferredSize(const AWinControl: TWinControl; class procedure TCarbonWSCustomEdit.GetPreferredSize(const AWinControl: TWinControl;
var PreferredWidth, PreferredHeight: integer; WithThemeSpace: Boolean); var PreferredWidth, PreferredHeight: integer; WithThemeSpace: Boolean);
begin begin
//TODO //TODO
@ -453,7 +453,7 @@ end;
{ TCarbonWSCustomCheckBox } { TCarbonWSCustomCheckBox }
function TCarbonWSCustomCheckBox.CreateHandle(const AWinControl: TWinControl; class function TCarbonWSCustomCheckBox.CreateHandle(const AWinControl: TWinControl;
const AParams: TCreateParams): TLCLIntfHandle; const AParams: TCreateParams): TLCLIntfHandle;
var var
CheckBox:TCheckBox; CheckBox:TCheckBox;