From 4b7d335b18ddd28572155552009068e5d14eba09 Mon Sep 17 00:00:00 2001 From: ocoursiere Date: Thu, 18 Dec 2003 22:48:12 +0000 Subject: [PATCH] Updates from Baldur --- bepascal/source/bepascal/pas/src/be/interface/box.pp | 12 ++++++------ .../source/bepascal/pas/src/be/interface/checkbox.pp | 6 +++--- .../bepascal/pas/src/be/interface/radiobutton.pp | 6 +++--- .../bepascal/pas/src/be/interface/textcontrol.pp | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/bepascal/source/bepascal/pas/src/be/interface/box.pp b/bepascal/source/bepascal/pas/src/be/interface/box.pp index 3c1f360..0e89aac 100644 --- a/bepascal/source/bepascal/pas/src/be/interface/box.pp +++ b/bepascal/source/bepascal/pas/src/be/interface/box.pp @@ -30,7 +30,7 @@ type BBox = class(BView) private public - constructor Create(Frame : BRect; Name : PChar; sResizingMode, sFlags : Cardinal; BorderStyle : border_style); + constructor Create(aFrame : BRect; Name : PChar; sResizingMode, sFlags : Cardinal; BorderStyle : border_style); constructor Create(data : BMessage); destructor Destroy; override; function Instantiate(data : BMessage) : BArchivable; @@ -44,7 +44,7 @@ type function GetLabel : PChar; function LabelView : BView; - procedure Draw(bounds : BRect); override; + procedure Draw(abounds : BRect); override; procedure AttachedToWindow; override; procedure DetachedFromWindow; override; procedure AllAttached; override; @@ -106,10 +106,10 @@ function BBox_Perform(AObject : TCPlusObject; d : Perform_code; arg : Pointer) : implementation -constructor BBox.Create(Frame : BRect; Name : PChar; sResizingMode, sFlags : Cardinal; BorderStyle : border_style); +constructor BBox.Create(aFrame : BRect; Name : PChar; sResizingMode, sFlags : Cardinal; BorderStyle : border_style); begin CreatePas; - CPlusObject := BBox_Create(Self, Frame.CPlusObject, Name, sResizingMode, sFlags, BorderStyle); + CPlusObject := BBox_Create(Self, aFrame.CPlusObject, Name, sResizingMode, sFlags, BorderStyle); end; constructor BBox.Create(data : BMessage); @@ -168,9 +168,9 @@ begin end; -procedure BBox.Draw(bounds : BRect); +procedure BBox.Draw(abounds : BRect); begin - BBox_Draw(CPlusObject, bounds{.CPlusObject}); + BBox_Draw(CPlusObject, abounds{.CPlusObject}); end; procedure BBox.AttachedToWindow; diff --git a/bepascal/source/bepascal/pas/src/be/interface/checkbox.pp b/bepascal/source/bepascal/pas/src/be/interface/checkbox.pp index 23e938d..c867146 100644 --- a/bepascal/source/bepascal/pas/src/be/interface/checkbox.pp +++ b/bepascal/source/bepascal/pas/src/be/interface/checkbox.pp @@ -27,7 +27,7 @@ type BCheckBox = class(BControl) private public destructor Destroy;override; - constructor Create(frame : BRect; name, aLabel : PChar; message : BMessage; sresizingMode, sflags : Cardinal); virtual; + constructor Create(aframe : BRect; name, aLabel : PChar; message : BMessage; sresizingMode, sflags : Cardinal); virtual; constructor Create(data : BMessage) ;override; function Instantiate(data : BMessage) : BArchivable; function Archive(data : BMessage; deep : boolean) : Status_t; @@ -89,10 +89,10 @@ begin inherited; end; -constructor BCheckBox.Create(frame : BRect; name, aLabel : PChar; message : BMessage; sresizingMode, sflags : Cardinal); +constructor BCheckBox.Create(aframe : BRect; name, aLabel : PChar; message : BMessage; sresizingMode, sflags : Cardinal); begin CreatePas; - CPlusObject := BCheckBox_Create(Self, frame.CPlusObject, name, aLabel, message.CPlusObject, sresizingMode, sflags); + CPlusObject := BCheckBox_Create(Self, aframe.CPlusObject, name, aLabel, message.CPlusObject, sresizingMode, sflags); end; constructor BCheckBox.Create(data : BMessage) ; diff --git a/bepascal/source/bepascal/pas/src/be/interface/radiobutton.pp b/bepascal/source/bepascal/pas/src/be/interface/radiobutton.pp index c4053c9..35a6b20 100644 --- a/bepascal/source/bepascal/pas/src/be/interface/radiobutton.pp +++ b/bepascal/source/bepascal/pas/src/be/interface/radiobutton.pp @@ -28,7 +28,7 @@ type BRadioButton = class(BControl) private public - constructor Create(frame : BRect; name, aLabel : PChar; message : BMessage; sresizingMode, sflags : Cardinal); virtual; + constructor Create(aframe : BRect; name, aLabel : PChar; message : BMessage; sresizingMode, sflags : Cardinal); virtual; constructor Create(data : BMessage); override; destructor Destroy; override; function Instantiate(data : BMessage) : BArchivable; @@ -102,10 +102,10 @@ function BRadioButton_Perform(AObject : TCPlusObject; d : Perform_code; arg : Po implementation -constructor BRadioButton.Create(frame : BRect; name, aLabel : PChar; message : BMessage; sresizingMode, sflags : Cardinal); +constructor BRadioButton.Create(aframe : BRect; name, aLabel : PChar; message : BMessage; sresizingMode, sflags : Cardinal); begin CreatePas; - CPlusObject := BRadioButton_Create(Self, frame.CPlusObject, name, aLabel, message.CPlusObject, sresizingMode, sflags); + CPlusObject := BRadioButton_Create(Self, aframe.CPlusObject, name, aLabel, message.CPlusObject, sresizingMode, sflags); end; constructor BRadioButton.Create(data : BMessage); diff --git a/bepascal/source/bepascal/pas/src/be/interface/textcontrol.pp b/bepascal/source/bepascal/pas/src/be/interface/textcontrol.pp index 377c1fa..c04a36d 100644 --- a/bepascal/source/bepascal/pas/src/be/interface/textcontrol.pp +++ b/bepascal/source/bepascal/pas/src/be/interface/textcontrol.pp @@ -29,7 +29,7 @@ type private public destructor Destroy;override; - constructor Create(frame : BRect; name, aLabel,initial : PChar; message : BMessage; sresizingMode, sflags : Cardinal); virtual; + constructor Create(aframe : BRect; name, aLabel,initial : PChar; message : BMessage; sresizingMode, sflags : Cardinal); virtual; constructor Create(data : BMessage);override; function Instantiate(data : BMessage) : BArchivable; function Archive(data : BMessage; deep : boolean) : Status_t; @@ -88,7 +88,7 @@ type end; procedure BTextControl_Free(AObject : TCPlusObject); cdecl; external BePascalLibName name 'BTextControl_Free'; -function BTextControl_Create(AObject : TBeObject; frame : TCPlusObject; name, aLabel ,initial: PChar; message : TCPlusObject; sresizingMode, flags : Cardinal): TCPlusObject; cdecl; external BePascalLibName name 'BTextControl_Create'; +function BTextControl_Create(AObject : TBeObject; aframe : TCPlusObject; name, aLabel ,initial: PChar; message : TCPlusObject; sresizingMode, flags : Cardinal): TCPlusObject; cdecl; external BePascalLibName name 'BTextControl_Create'; function BTextControl_Create(AObject : TBeObject; data : TCPlusObject): TCPlusObject; cdecl; external BePascalLibName name 'BTextControl_Create_1'; function BTextControl_Instantiate(AObject : TCPlusObject; data : TCPlusObject) : BArchivable; cdecl; external BePascalLibName name 'BTextControl_Instantiate'; function BTextControl_Archive(AObject : TCPlusObject; data : TCPlusObject; deep : boolean) : Status_t; cdecl; external BePascalLibName name 'BTextControl_Archive'; @@ -155,10 +155,10 @@ begin inherited; end; -constructor BTextControl.Create(frame : BRect; name, aLabel,initial : PChar; message : BMessage; sresizingMode, sflags : Cardinal); +constructor BTextControl.Create(aframe : BRect; name, aLabel,initial : PChar; message : BMessage; sresizingMode, sflags : Cardinal); begin CreatePas; - CPlusObject := BTextControl_Create(Self, frame.CPlusObject, name, aLabel,initial, message.CPlusObject, sresizingMode, sflags); + CPlusObject := BTextControl_Create(Self, aframe.CPlusObject, name, aLabel,initial, message.CPlusObject, sresizingMode, sflags); end;