paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-22 23:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

LazReport, fix error in dialogs when object is deleted and then a new one inserted, issue #25097

Browse Source 
git-svn-id: trunk@43047 -
This commit is contained in:
jesus 2013-09-30 20:13:52 +00:00
parent 76fbc9e44c
commit c9ae10f839
3 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/lazreport/source/addons/DialogControls/lrdbdialogcontrols.pas
View File

@ -166,7 +166,7 @@ end;
function TlrDBLookupComboBox.CreateControl: TControl;
begin
Result:=TDBLookupComboBox.Create(OwnerForm);
Result:=TDBLookupComboBox.Create(nil);
TDBLookupComboBox(Result).Style:=csDropDownList;
TDBLookupComboBox(Result).OnCloseUp:=@DBLookupComboBox1CloseUp;
end;

35
components/lazreport/source/addons/DialogControls/lrdialogcontrols.pas
View File

@ -67,9 +67,11 @@ type
function CreateControl:TControl;virtual;abstract;
public
constructor Create(AOwnerPage:TfrPage); override;
destructor Destroy; override;
procedure LoadFromXML(XML: TLrXMLConfig; const Path: String); override;
procedure SaveToXML(XML: TLrXMLConfig; const Path: String); override;
procedure UpdateControlPosition; override;
procedure AttachToParent; override;
property Control: TControl read FControl write FControl;
property AutoSize: Boolean read GetAutoSize write SetAutoSize;
@ -426,7 +428,7 @@ end;
function TlrButtonPanel.CreateControl: TControl;
begin
Result:=TButtonPanel.Create(OwnerForm);
Result:=TButtonPanel.Create(nil);
end;
procedure TlrButtonPanel.AfterCreate;
@ -499,7 +501,7 @@ end;
function TlrDateEdit.CreateControl: TControl;
begin
Result:=TDateEdit.Create(OwnerForm);
Result:=TDateEdit.Create(nil);
end;
constructor TlrDateEdit.Create(AOwnerPage: TfrPage);
@ -566,7 +568,7 @@ end;
function TlrListBox.CreateControl: TControl;
begin
Result:=TListBox.Create(OwnerForm);
Result:=TListBox.Create(nil);
end;
constructor TlrListBox.Create(AOwnerPage: TfrPage);
@ -621,7 +623,7 @@ end;
function TlrMemo.CreateControl: TControl;
begin
Result:=TMemo.Create(OwnerForm);
Result:=TMemo.Create(nil);
end;
constructor TlrMemo.Create(AOwnerPage: TfrPage);
@ -645,7 +647,7 @@ end;
function TlrRadioButton.CreateControl: TControl;
begin
Result:=TRadioButton.Create(OwnerForm);
Result:=TRadioButton.Create(nil);
end;
function TlrRadioButton.GetCheckStyle(ACheck: boolean): TThemedButton;
@ -727,7 +729,7 @@ end;
function TlrComboBox.CreateControl: TControl;
begin
Result:=TComboBox.Create(OwnerForm);
Result:=TComboBox.Create(nil);
end;
constructor TlrComboBox.Create(AOwnerPage: TfrPage);
@ -793,7 +795,7 @@ end;
function TlrCheckBox.CreateControl: TControl;
begin
Result:=TCheckBox.Create(OwnerForm);
Result:=TCheckBox.Create(nil);
end;
function TlrCheckBox.GetCheckStyle(ACheck: boolean): TThemedButton;
@ -852,7 +854,7 @@ end;
function TlrButton.CreateControl: TControl;
begin
Result:=TBitBtn.Create(OwnerForm);
Result:=TBitBtn.Create(nil);
Result.AutoSize:=true;
end;
@ -891,7 +893,7 @@ end;
function TlrEdit.CreateControl: TControl;
begin
Result:=TEdit.Create(OwnerForm);
Result:=TEdit.Create(nil);
end;
constructor TlrEdit.Create(AOwnerPage: TfrPage);
@ -948,7 +950,7 @@ end;
function TlrLabel.CreateControl: TControl;
begin
Result:=TLabel.Create(OwnerForm);
Result:=TLabel.Create(nil);
end;
@ -1094,6 +1096,11 @@ begin
FControl.Height:=round(Height);
end;
procedure TlrVisualControl.AttachToParent;
begin
FControl.Parent := OwnerForm;
end;
procedure TlrVisualControl.AfterCreate;
begin
inherited AfterCreate;
@ -1107,7 +1114,6 @@ begin
FControl:=CreateControl;
if Assigned(FControl) then
begin
FControl.Parent:=OwnerForm;
x:=FControl.Left;
Y:=FControl.Top;
DX:=FControl.Width;
@ -1115,6 +1121,13 @@ begin
end;
end;
destructor TlrVisualControl.Destroy;
begin
FControl.Free;
FControl := nil;
inherited Destroy;
end;
procedure TlrVisualControl.LoadFromXML(XML: TLrXMLConfig; const Path: String);
begin
inherited LoadFromXML(XML, Path);

9
components/lazreport/source/lr_class.pas
View File

@ -347,7 +347,8 @@ type
procedure PaintDesignControl; virtual;abstract;
public
procedure UpdateControlPosition; virtual;
function OwnerForm:TWinControl;
procedure AttachToParent; virtual;
function OwnerForm:TWinControl; virtual;
constructor Create(AOwnerPage:TfrPage); override;
procedure Draw(ACanvas: TCanvas); override;
procedure DefinePopupMenu(Popup: TPopupMenu); override;
@ -1903,6 +1904,11 @@ begin
end;
procedure TfrControl.AttachToParent;
begin
end;
function TfrControl.OwnerForm: TWinControl;
begin
if Assigned(OwnerPage) and (OwnerPage is TfrPageDialog) then
@ -11914,6 +11920,7 @@ begin
if not (P is TfrNonVisualControl) then
begin
fHasVisibleControls:=true;
P.AttachToParent;
P.UpdateControlPosition;
end;
end;