Revert "widgets, MW move, remove trick used to get public prop"

This reverts commit a899c73bc8.
This commit is contained in:
Basile Burg 2017-03-02 06:56:45 +01:00
parent 5831add738
commit e451d915b8
No known key found for this signature in database
GPG Key ID: 1868039F415CB8CF
2 changed files with 9 additions and 3 deletions

View File

@ -1468,7 +1468,7 @@ object CEMainForm: TCEMainForm
OnCloseQuery = FormCloseQuery OnCloseQuery = FormCloseQuery
OnDropFiles = FormDropFiles OnDropFiles = FormDropFiles
ShowHint = True ShowHint = True
LCLVersion = '1.6.4.0' LCLVersion = '1.6.2.0'
object mainMenu: TMainMenu object mainMenu: TMainMenu
Images = imgList Images = imgList
top = 1 top = 1

View File

@ -22,6 +22,11 @@ type
TCEApplicationOptions = class; TCEApplicationOptions = class;
TAnchorDockSplitterEx = class(TAnchorDockSplitter)
public
property OnMouseWheel;
end;
TAsyncWait = (awNo, awYes, awCustom); TAsyncWait = (awNo, awYes, awCustom);
TRunnableToFolderCondition = ( TRunnableToFolderCondition = (
@ -1343,6 +1348,7 @@ begin
accept := GetKeyShiftState = [ssCtrl]; accept := GetKeyShiftState = [ssCtrl];
end; end;
//TODO-cdocking: remove the usage of TAnchorDockSplitterEx from Laz 1.8 RC1 (OnMouseWheel public)
procedure TCEMainForm.DockSplitterMw(Sender: TObject; Shift: TShiftState; WheelDelta: Integer; MousePos: TPoint; var Handled: Boolean); procedure TCEMainForm.DockSplitterMw(Sender: TObject; Shift: TShiftState; WheelDelta: Integer; MousePos: TPoint; var Handled: Boolean);
var var
offs: integer; offs: integer;
@ -1378,10 +1384,10 @@ begin
if site is TAnchorDockHostSite then if site is TAnchorDockHostSite then
begin begin
if TAnchorDockHostSite(site).BoundSplitter.isNotNil then if TAnchorDockHostSite(site).BoundSplitter.isNotNil then
TSplitter(TAnchorDockHostSite(site).BoundSplitter).OnMouseWheel:=@DockSplitterMw; TAnchorDockSplitterEx(TAnchorDockHostSite(site).BoundSplitter).OnMouseWheel:=@DockSplitterMw;
end end
else if site is TAnchorDockSplitter then else if site is TAnchorDockSplitter then
TSplitter(TAnchorDockSplitter(site)).OnMouseWheel:=@DockSplitterMw; TAnchorDockSplitterEx(TAnchorDockSplitter(site)).OnMouseWheel:=@DockSplitterMw;
end; end;
end; end;
end; end;