deactivated our TDataModule for fpc 1.0.8 and 1.1

git-svn-id: trunk@4235 -
This commit is contained in:
mattias 2003-06-05 15:25:28 +00:00
parent 74f714e33b
commit c5919c3dfd
2 changed files with 15 additions and 24 deletions

View File

@ -299,7 +299,6 @@ end;
procedure TManagedBreakPoint.OnSourceMarkCreatePopupMenu(
SenderMark: TSourceMark; const AddMenuItem: TAddMenuItemProc);
begin
// add enable/disable toggle menu item
if Enabled then
AddMenuItem('Disable Breakpoint',true,@OnToggleEnableMenuItemClick)
else
@ -1418,6 +1417,9 @@ end.
{ =============================================================================
$Log$
Revision 1.48 2003/06/05 15:25:28 mattias
deactivated our TDataModule for fpc 1.0.8 and 1.1
Revision 1.47 2003/06/04 16:34:11 mattias
implemented popupmenu items in source editor for breakpoints

View File

@ -784,7 +784,7 @@ type
Procedure SelectOnlyThisComponent(AComponent:TComponent); virtual; abstract;
end;
{$IFNDEF UseFCLDataModule}
{$IFDEF VER1_0_7}
type
{ TDataModule }
@ -818,10 +818,10 @@ type
procedure BeforeDestruction; override;
property DesignOffset: TPoint read FDesignOffset write FDesignOffset;
property DesignSize: TPoint read FDesignSize write FDesignSize;
property OldCreateOrder: Boolean read FOldCreateOrder write FOldCreateOrder;
published
property OnCreate: TNotifyEvent read FOnCreate write FOnCreate;
property OnDestroy: TNotifyEvent read FOnDestroy write FOnDestroy;
property OldCreateOrder: Boolean read FOldCreateOrder write FOldCreateOrder;
end;
const
@ -888,6 +888,11 @@ var
FocusMessages: Boolean;
FocusCount: Integer;
procedure Register;
begin
RegisterComponents('Additional',[TScrollBox]);
end;
{------------------------------------------------------------------------------
procedure NotifyApplicationUserInput;
@ -972,7 +977,6 @@ begin
Result := true;
end;
//==============================================================================
function InitResourceComponent(Instance: TComponent;
@ -1126,13 +1130,8 @@ begin
InterfaceObject:=nil;
end;
procedure Register;
begin
RegisterComponents('Additional',[TScrollBox]);
end;
{$IFNDEF UseFCLDataModule}
{$IFDEF VER1_0_7}
{ TDataModule }
constructor TDataModule.Create(TheOwner: TComponent);
@ -1142,11 +1141,7 @@ begin
CreateNew(TheOwner,0);
if (ClassType <> TDataModule) and not (csDesigning in ComponentState) then
begin
{$IFDEF UseFCLInitResourceComponent}
if not Inic.InitInheritedComponent(Self, TDataModule) then begin
{$ELSE}
if not InitResourceComponent(Self, TForm) then begin
{$ENDIF}
raise EResNotFound.CreateFmt(lisLCLResourceSNotFound, [ClassName]);
end;
if OldCreateOrder then DoCreate;
@ -1342,13 +1337,6 @@ end;
{$I hintwindow.inc}
{$IFDEF UseFCLInitResourceComponent}
function LCLInitComponent(Instance: TComponent; RootAncestor: TClass): boolean;
begin
Result:=InitResourceComponent(Instance,RootAncestor);
end;
{$ENDIF}
initialization
FocusCount := 0;
Focusmessages := True;
@ -1357,9 +1345,10 @@ initialization
Screen:= TScreen.Create(nil);
Application:= TApplication.Create(nil);
{$IFDEF UseFCLInitResourceComponent}
RegisterInitComponentHandler(TComponent,@LCLInitComponent);
{$ENDIF}
{$IFNDEF VER1_0_7}
RegisterInitComponentHandler(TComponent,@InitResourceComponent);
{$ENDIF}
// keep this comment, there is parser a bug in fpc 1.0.x
finalization
//writeln('forms.pp - finalization section');