diff --git a/components/dockedformeditor/source/dockedanchordesigner.pas b/components/dockedformeditor/source/dockedanchordesigner.pas index 77f55fdf04..ca5d531f38 100644 --- a/components/dockedformeditor/source/dockedanchordesigner.pas +++ b/components/dockedformeditor/source/dockedanchordesigner.pas @@ -84,7 +84,6 @@ type procedure BeginUpdate; override; procedure EndUpdate; override; procedure Invalidate; override; - function IsFocused: Boolean; override; procedure Refresh; override; public property SelectedControl: TAnchorControl read FSelectedControl write SetSelectedControl; @@ -921,14 +920,6 @@ begin FBackGround.Invalidate; end; -function TAnchorDesigner.IsFocused: Boolean; -begin - if Assigned(IsFocusedFunc) then - Result := IsFocusedFunc() - else - Result := False; -end; - procedure TAnchorDesigner.Refresh; var i: Integer; diff --git a/components/dockedformeditor/source/dockedbasicanchordesigner.pas b/components/dockedformeditor/source/dockedbasicanchordesigner.pas index c16066a194..0fbfa67ce0 100644 --- a/components/dockedformeditor/source/dockedbasicanchordesigner.pas +++ b/components/dockedformeditor/source/dockedbasicanchordesigner.pas @@ -30,31 +30,20 @@ type TBasicAnchorDesigner = class private - FIsFocusedFunc: TBoolFunc; FOnDesignerSetFocus: TProcedureOfObject; FOnMouseWheel: TMouseWheelEvent; public - constructor Create; - function IsFocused: Boolean; virtual; abstract; procedure Abort; virtual; abstract; procedure BeginUpdate; virtual; abstract; procedure EndUpdate; virtual; abstract; procedure Invalidate; virtual; abstract; procedure Refresh; virtual; abstract; public - property IsFocusedFunc: TBoolFunc read FIsFocusedFunc write FIsFocusedFunc; property OnDesignerSetFocus: TProcedureOfObject read FOnDesignerSetFocus write FOnDesignerSetFocus; property OnMouseWheel: TMouseWheelEvent read FOnMouseWheel write FOnMouseWheel; end; implementation -{ TBasicAnchorDesigner } - -constructor TBasicAnchorDesigner.Create; -begin - FIsFocusedFunc := nil; -end; - end. diff --git a/components/dockedformeditor/source/dockedmainide.pas b/components/dockedformeditor/source/dockedmainide.pas index e5d1a2cf73..8fa852f8be 100644 --- a/components/dockedformeditor/source/dockedmainide.pas +++ b/components/dockedformeditor/source/dockedmainide.pas @@ -439,7 +439,7 @@ begin LDesignForm := SourceEditorWindows.FindDesignForm(LPageCtrl); if LDesigner = nil then - LPageCtrl.HideDesignPages + LPageCtrl.RemoveDesignPages else begin if not Assigned(LPageCtrl.Resizer) then LPageCtrl.CreateResizer; diff --git a/components/dockedformeditor/source/dockedmodulepagecontrol.pas b/components/dockedformeditor/source/dockedmodulepagecontrol.pas index 410e0f6675..bbe0afd03f 100644 --- a/components/dockedformeditor/source/dockedmodulepagecontrol.pas +++ b/components/dockedformeditor/source/dockedmodulepagecontrol.pas @@ -52,7 +52,7 @@ type procedure CreateTabSheetDesigner; procedure DesignerSetFocus; function DesignerFocused: Boolean; - procedure HideDesignPages; + procedure RemoveDesignPages; procedure InitPage; procedure RefreshResizer; procedure ShowCode; @@ -159,7 +159,7 @@ begin (ActivePage = FTabSheetAnchors); end; -procedure TModulePageControl.HideDesignPages; +procedure TModulePageControl.RemoveDesignPages; begin FreeAndNil(FTabSheetAnchors); FreeAndNil(FTabSheetDesigner); @@ -182,7 +182,6 @@ begin if not Assigned(DesignForm.AnchorDesigner) then begin DesignForm.AnchorDesigner := TAnchorDesigner.Create(DesignForm, Resizer.ResizeFrame.PanelAnchorContainer); - DesignForm.AnchorDesigner.IsFocusedFunc := @Resizer.ResizeFrame.IsFocused; DesignForm.AnchorDesigner.OnDesignerSetFocus := @DesignerSetFocus; end; DesignForm.AnchorDesigner.Refresh; diff --git a/components/dockedformeditor/source/dockedsourceeditorwindow.pas b/components/dockedformeditor/source/dockedsourceeditorwindow.pas index 9404219273..4aba6b030d 100644 --- a/components/dockedformeditor/source/dockedsourceeditorwindow.pas +++ b/components/dockedformeditor/source/dockedsourceeditorwindow.pas @@ -273,7 +273,7 @@ begin if (LWindow.SourceEditorWindowInterface.ActiveEditor = nil) or (LWindow.SourceEditorWindowInterface.ActiveEditor.GetDesigner(True) <> nil) then - LPageCtrl.HideDesignPages + LPageCtrl.RemoveDesignPages else begin LPageCtrl.CreateTabSheetDesigner; if not (LPageCtrl.DesignForm.Form is TNonControlProxyDesignerForm) then