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

remove own declaration of TDataModule => use rtl instead

Browse Source 
git-svn-id: trunk@14745 -
This commit is contained in:
paul 2008-04-04 00:31:33 +00:00
parent 952a8829f5
commit 34642accc0
2 changed files with 1 additions and 258 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ide/customformeditor.pp
View File

@ -302,7 +302,7 @@ each control that's dropped onto the form
const const
StandardDesignerBaseClasses: array[1..2] of TComponentClass = ( StandardDesignerBaseClasses: array[1..2] of TComponentClass = (
Forms.TForm, Forms.TForm,
{$IFNDEF UseFCLDataModule}Forms.{$ENDIF}TDataModule TDataModule
); );

257
lcl/forms.pp
View File

@ -735,11 +735,6 @@ type
snActiveFormChanged snActiveFormChanged
); );
{$IFNDEF UseFCLDataModule}
{ TDataModule }
TDataModule = class;
{$ENDIF}
{ TScreen } { TScreen }
TScreen = class(TLCLComponent) TScreen = class(TLCLComponent)
private private
@ -1288,57 +1283,6 @@ type
destructor Destroy; override; destructor Destroy; override;
end; end;
{$IFNDEF UseFCLDataModule}
//type
{ TDataModule }
TDataModule = class(TComponent)
private
FDesignSize: TPoint;
FDesignOffset: TPoint;
FOnCreate: TNotifyEvent;
FOnDestroy: TNotifyEvent;
FOldCreateOrder: Boolean;
function OldCreateOrderIsStored: boolean;
procedure ReadHeight(Reader: TReader);
procedure ReadHorizontalOffset(Reader: TReader);
procedure ReadVerticalOffset(Reader: TReader);
procedure ReadWidth(Reader: TReader);
procedure WriteWidth(Writer: TWriter);
procedure WriteHorizontalOffset(Writer: TWriter);
procedure WriteVerticalOffset(Writer: TWriter);
procedure WriteHeight(Writer: TWriter);
protected
procedure DoCreate; virtual;
procedure DoDestroy; virtual;
procedure DefineProperties(Filer: TFiler); override;
procedure GetChildren(Proc: TGetChildProc; Root: TComponent); override;
function HandleCreateException: Boolean; dynamic;
procedure ReadState(Reader: TReader); override;
public
constructor Create(TheOwner: TComponent); override;
constructor CreateNew(TheOwner: TComponent; CreateMode: Integer); virtual;
destructor Destroy; override;
procedure AfterConstruction; override;
procedure BeforeDestruction; override;
property DesignOffset: TPoint read FDesignOffset write FDesignOffset;
property DesignSize: TPoint read FDesignSize write FDesignSize;
published
property OnCreate: TNotifyEvent read FOnCreate write FOnCreate;
property OnDestroy: TNotifyEvent read FOnDestroy write FOnDestroy;
property OldCreateOrder: Boolean read FOldCreateOrder write FOldCreateOrder
stored OldCreateOrderIsStored;
end;
const
AddDataModule: procedure (DataModule: TDataModule) of object = nil;
RemoveDataModule: procedure (DataModule: TDataModule) of object = nil;
ApplicationHandleException: procedure (Sender: TObject) of object = nil;
ApplicationShowException: procedure (E: Exception) of object = nil;
{$ENDIF}
function KeysToShiftState(Keys: Word): TShiftState; function KeysToShiftState(Keys: Word): TShiftState;
function KeyDataToShiftState(KeyData: Longint): TShiftState; function KeyDataToShiftState(KeyData: Longint): TShiftState;
@ -1640,207 +1584,6 @@ begin
end; end;
{$IFNDEF UseFCLDataModule}
{ TDataModule }
constructor TDataModule.Create(TheOwner: TComponent);
begin
GlobalNameSpace.BeginWrite;
try
CreateNew(TheOwner,0);
if (ClassType <> TDataModule) and not (csDesigning in ComponentState) then
begin
if not InitResourceComponent(Self, TDataModule) then begin
raise EResNotFound.CreateFmt(lisLCLResourceSNotFound, [ClassName]);
end;
if OldCreateOrder then DoCreate;
end;
finally
GlobalNameSpace.EndWrite;
end;
end;
procedure TDataModule.AfterConstruction;
begin
if not OldCreateOrder then DoCreate;
end;
constructor TDataModule.CreateNew(TheOwner: TComponent; CreateMode: Integer);
begin
inherited Create(TheOwner);
if Assigned(AddDataModule) and (CreateMode >= 0) then
AddDataModule(Self);
end;
procedure TDataModule.BeforeDestruction;
begin
//GlobalNameSpace.BeginWrite;
Destroying;
RemoveFixupReferences(Self, '');
if not OldCreateOrder then DoDestroy;
end;
destructor TDataModule.Destroy;
begin
if not (csDestroying in ComponentState) then
; //GlobalNameSpace.BeginWrite;
try
if OldCreateOrder then DoDestroy;
if Assigned(RemoveDataModule) then
RemoveDataModule(Self);
inherited Destroy;
finally
//GlobalNameSpace.EndWrite;
end;
end;
procedure TDataModule.DoCreate;
begin
if Assigned(FOnCreate) then
//try
FOnCreate(Self);
{except
begin
if not HandleCreateException then
raise;
end;
end;}
end;
procedure TDataModule.DoDestroy;
begin
if Assigned(FOnDestroy) then begin
//try
FOnDestroy(Self);
{except
begin
if Assigned(ApplicationHandleException) then
ApplicationHandleException(Self);
end;
end;}
end;
end;
procedure TDataModule.DefineProperties(Filer: TFiler);
var
Ancestor: TDataModule;
function DoWriteWidth: Boolean;
begin
Result := True;
if Ancestor <> nil then Result := FDesignSize.X <> Ancestor.FDesignSize.X;
end;
function DoWriteHorizontalOffset: Boolean;
begin
if Ancestor <> nil then
Result := FDesignOffset.X <> Ancestor.FDesignOffset.X else
Result := FDesignOffset.X <> 0;
end;
function DoWriteVerticalOffset: Boolean;
begin
if Ancestor <> nil then
Result := FDesignOffset.Y <> Ancestor.FDesignOffset.Y else
Result := FDesignOffset.Y <> 0;
end;
function DoWriteHeight: Boolean;
begin
Result := True;
if Ancestor <> nil then Result := FDesignSize.Y <> Ancestor.FDesignSize.Y;
end;
begin
inherited DefineProperties(Filer);
Ancestor := TDataModule(Filer.Ancestor);
Filer.DefineProperty('Height', @ReadHeight, @WriteHeight, DoWriteHeight);
Filer.DefineProperty('HorizontalOffset', @ReadHorizontalOffset,
@WriteHorizontalOffset, DoWriteHorizontalOffset);
Filer.DefineProperty('VerticalOffset', @ReadVerticalOffset,
@WriteVerticalOffset, DoWriteVerticalOffset);
Filer.DefineProperty('Width', @ReadWidth, @WriteWidth, DoWriteWidth);
end;
procedure TDataModule.GetChildren(Proc: TGetChildProc; Root: TComponent);
var
I: Integer;
OwnedComponent: TComponent;
begin
inherited GetChildren(Proc, Root);
if Root = Self then begin
for I := 0 to ComponentCount - 1 do
begin
OwnedComponent := Components[I];
if not OwnedComponent.HasParent then Proc(OwnedComponent);
end;
end;
end;
function TDataModule.HandleCreateException: Boolean;
begin
if Assigned(ApplicationHandleException) then
begin
ApplicationHandleException(Self);
Result := True;
end
else
Result := False;
end;
procedure TDataModule.ReadState(Reader: TReader);
begin
FOldCreateOrder := false;
inherited ReadState(Reader);
end;
procedure TDataModule.ReadWidth(Reader: TReader);
begin
FDesignSize.X := Reader.ReadInteger;
end;
procedure TDataModule.ReadHorizontalOffset(Reader: TReader);
begin
FDesignOffset.X := Reader.ReadInteger;
end;
procedure TDataModule.ReadVerticalOffset(Reader: TReader);
begin
FDesignOffset.Y := Reader.ReadInteger;
end;
procedure TDataModule.ReadHeight(Reader: TReader);
begin
FDesignSize.Y := Reader.ReadInteger;
end;
function TDataModule.OldCreateOrderIsStored: boolean;
begin
Result:=FOldCreateOrder;
end;
procedure TDataModule.WriteWidth(Writer: TWriter);
begin
Writer.WriteInteger(FDesignSize.X);
end;
procedure TDataModule.WriteHorizontalOffset(Writer: TWriter);
begin
Writer.WriteInteger(FDesignOffset.X);
end;
procedure TDataModule.WriteVerticalOffset(Writer: TWriter);
begin
Writer.WriteInteger(FDesignOffset.Y);
end;
procedure TDataModule.WriteHeight(Writer: TWriter);
begin
Writer.WriteInteger(FDesignSize.Y);
end;
{$ENDIF}
//============================================================================== //==============================================================================
{$I controlscrollbar.inc} {$I controlscrollbar.inc}