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

IDE: designer: set default ancestor when writing component

Browse Source 
git-svn-id: trunk@15242 -
This commit is contained in:
mattias 2008-05-26 16:12:23 +00:00
parent 16cf6730fd
commit c52071e8b7
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ide/customformeditor.pp
View File

@ -1339,8 +1339,12 @@ function TCustomFormEditor.SaveUnitComponentToBinStream(AnUnitInfo: TUnitInfo;
var var
Writer: TWriter; Writer: TWriter;
DestroyDriver: Boolean; DestroyDriver: Boolean;
AncestorUnitInfo: TUnitInfo; { $IFDEF VerboseSaveUnitComponent}
memStream: TMemoryStream;
s: string;
AncestorUnit: TUnitInfo;
Ancestor: TComponent; Ancestor: TComponent;
{ $ENDIF}
begin begin
// save designer form properties to the component // save designer form properties to the component
SaveHiddenDesignerFormProperties(AnUnitInfo.Component); SaveHiddenDesignerFormProperties(AnUnitInfo.Component);
@ -1359,10 +1363,27 @@ begin
BinCompStream.Position:=0; BinCompStream.Position:=0;
Writer:=CreateLRSWriter(BinCompStream,DestroyDriver); Writer:=CreateLRSWriter(BinCompStream,DestroyDriver);
Writer.OnFindAncestor:=@WriterFindAncestor; Writer.OnFindAncestor:=@WriterFindAncestor;
Writer.WriteDescendent(AnUnitInfo.Component,nil); AncestorUnit:=AnUnitInfo.FindAncestorUnit;
Ancestor:=nil;
if AncestorUnit<>nil then
Ancestor:=AncestorUnit.Component;
Writer.WriteDescendent(AnUnitInfo.Component,Ancestor);
if DestroyDriver then Writer.Driver.Free; if DestroyDriver then Writer.Driver.Free;
FreeAndNil(Writer); FreeAndNil(Writer);
AnUnitInfo.ComponentLastBinStreamSize:=BinCompStream.Size; AnUnitInfo.ComponentLastBinStreamSize:=BinCompStream.Size;
{ $IFDEF VerboseSaveUnitComponent}
BinCompStream.Position:=0;
memStream:=TMemoryStream.Create;
LRSObjectBinaryToText(BinCompStream,memStream);
memStream.Position:=0;
SetLength(s,memStream.Size);
memStream.Read(s[1],length(s));
DebugLn(['TCustomFormEditor.SaveUnitComponentToBinStream START ==================']);
debugln(s);
DebugLn(['TCustomFormEditor.SaveUnitComponentToBinStream END ==================']);
memStream.Free;
{ $ENDIF}
except except
on E: Exception do begin on E: Exception do begin
DumpExceptionBackTrace; DumpExceptionBackTrace;

7
ide/main.pp
View File

@ -4650,6 +4650,8 @@ var
ADesigner: TDesigner; ADesigner: TDesigner;
Grubber: TLRTGrubber; Grubber: TLRTGrubber;
LRTFilename: String; LRTFilename: String;
AncestorUnit: TUnitInfo;
Ancestor: TComponent;
begin begin
Result:=mrCancel; Result:=mrCancel;
@ -4699,6 +4701,11 @@ begin
{$ENDIF} {$ENDIF}
//DebugLn(['TMainIDE.DoSaveUnitComponent AncestorInstance=',dbgsName(AncestorInstance)]); //DebugLn(['TMainIDE.DoSaveUnitComponent AncestorInstance=',dbgsName(AncestorInstance)]);
Writer.OnFindAncestor:=@FormEditor1.WriterFindAncestor; Writer.OnFindAncestor:=@FormEditor1.WriterFindAncestor;
AncestorUnit:=AnUnitInfo.FindAncestorUnit;
Ancestor:=nil;
if AncestorUnit<>nil then
Ancestor:=AncestorUnit.Component;
Writer.WriteDescendent(AnUnitInfo.Component,Ancestor);
Writer.WriteDescendent(AnUnitInfo.Component,nil); Writer.WriteDescendent(AnUnitInfo.Component,nil);
if DestroyDriver then Writer.Driver.Free; if DestroyDriver then Writer.Driver.Free;
FreeAndNil(Writer); FreeAndNil(Writer);