paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-06-16 21:48:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

dont use direct call of TControl.DoEndDock from DockPerformer (hint from Marius)

Browse Source 
git-svn-id: trunk@13971 -
This commit is contained in:
paul 2008-02-04 02:39:25 +00:00
parent 49c34c5cb4
commit 543e960d76
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lcl/controls.pp
View File

@ -400,6 +400,7 @@ type
protected protected
procedure AdjustDockRect(ARect: TRect); virtual; procedure AdjustDockRect(ARect: TRect); virtual;
function GetDragCursor(Accepted: Boolean; X, Y: Integer): TCursor; override; function GetDragCursor(Accepted: Boolean; X, Y: Integer): TCursor; override;
procedure EndDrag(Target: TObject; X, Y: Integer); override;
public public
property DockRect: TRect read FDockRect write FDockRect; property DockRect: TRect read FDockRect write FDockRect;
property DropAlign: TAlign read FDropAlign write FDropAlign; property DropAlign: TAlign read FDropAlign write FDropAlign;

2
lcl/include/dragmanager.inc
View File

@ -536,7 +536,7 @@ begin
if not Accepted then if not Accepted then
ADockObjectCopy.Control.DragCanceled; ADockObjectCopy.Control.DragCanceled;
ADockObjectCopy.Control.DoEndDock(ADockObjectCopy.DragTarget,TargetPos.X,TargetPos.Y); ADockObjectCopy.EndDrag(ADockObjectCopy.DragTarget,TargetPos.X,TargetPos.Y);
finally finally
if FDragObjectAutoFree then if FDragObjectAutoFree then
ADockObjectCopy.Free ADockObjectCopy.Free

6
lcl/include/dragobject.inc
View File

@ -99,6 +99,12 @@ begin
Result := crDefault; Result := crDefault;
end; end;
procedure TDragDockObject.EndDrag(Target: TObject; X, Y: Integer);
begin
if FControl <> nil then
FControl.DoEndDock(Target, X, Y);
end;
// included by controls.pp // included by controls.pp

2
lcl/interfaces/win32/win32wscomctrls.pp
View File

@ -363,8 +363,6 @@ end;
class procedure TWin32WSStatusBar.GetPreferredSize(const AWinControl: TWinControl; class procedure TWin32WSStatusBar.GetPreferredSize(const AWinControl: TWinControl;
var PreferredWidth, PreferredHeight: integer; WithThemeSpace: Boolean); var PreferredWidth, PreferredHeight: integer; WithThemeSpace: Boolean);
var
R: TRect;
begin begin
if (PreferredStatusBarHeight=0) then if (PreferredStatusBarHeight=0) then
InitializePreferredStatusBarHeight; InitializePreferredStatusBarHeight;