From 72a9ffc042f2c9f450921a270c9f1f2808f82792 Mon Sep 17 00:00:00 2001 From: alexs75 Date: Mon, 29 Sep 2014 07:02:18 +0000 Subject: [PATCH] RxFPC: Publish events OnMouseWheel, OnMouseWheelDown and OnMouseWheelUp for rx controls. git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3610 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/rx/trunk/autopanel.pas | 3 +++ components/rx/trunk/curredit.pas | 3 +++ components/rx/trunk/pickdate.pas | 3 +++ components/rx/trunk/rxclock.pas | 3 +++ components/rx/trunk/rxctrls.pas | 6 ++++++ components/rx/trunk/rxdaterangeeditunit.pas | 3 +++ components/rx/trunk/rxdbcolorbox.pas | 3 +++ components/rx/trunk/rxdbcomb.pas | 3 +++ components/rx/trunk/rxdbctrls.pas | 3 +++ components/rx/trunk/rxdbgrid.pas | 3 +++ components/rx/trunk/rxdbspinedit.pas | 3 +++ components/rx/trunk/rxdbtimeedit.pas | 3 +++ components/rx/trunk/rxdice.pas | 3 +++ components/rx/trunk/rxlookup.pas | 3 +++ components/rx/trunk/rxspin.pas | 8 ++------ components/rx/trunk/rxswitch.pas | 3 +++ components/rx/trunk/rxtimeedit.pas | 3 +++ components/rx/trunk/rxtoolbar.pas | 7 +++++-- components/rx/trunk/rxviewspanel.pas | 3 +++ components/rx/trunk/tooledit.pas | 3 +++ 20 files changed, 64 insertions(+), 8 deletions(-) diff --git a/components/rx/trunk/autopanel.pas b/components/rx/trunk/autopanel.pas index e6ffa1dc3..73319dac9 100644 --- a/components/rx/trunk/autopanel.pas +++ b/components/rx/trunk/autopanel.pas @@ -104,6 +104,9 @@ type property OnMouseDown; property OnMouseMove; property OnMouseUp; + property OnMouseWheel; + property OnMouseWheelDown; + property OnMouseWheelUp; property OnResize; property OnStartDrag; diff --git a/components/rx/trunk/curredit.pas b/components/rx/trunk/curredit.pas index fa1304513..88662d655 100644 --- a/components/rx/trunk/curredit.pas +++ b/components/rx/trunk/curredit.pas @@ -190,6 +190,9 @@ type property OnMouseDown; property OnMouseMove; property OnMouseUp; + property OnMouseWheel; + property OnMouseWheelDown; + property OnMouseWheelUp; property OnContextPopup; property OnStartDrag; diff --git a/components/rx/trunk/pickdate.pas b/components/rx/trunk/pickdate.pas index 710706fba..3cb8f20fa 100644 --- a/components/rx/trunk/pickdate.pas +++ b/components/rx/trunk/pickdate.pas @@ -162,6 +162,9 @@ type property OnMouseLeave; property OnMouseMove; property OnMouseUp; + property OnMouseWheel; + property OnMouseWheelDown; + property OnMouseWheelUp; property OnResize; property OnPrepareCanvas; end; diff --git a/components/rx/trunk/rxclock.pas b/components/rx/trunk/rxclock.pas index abc3983cd..a86582d74 100644 --- a/components/rx/trunk/rxclock.pas +++ b/components/rx/trunk/rxclock.pas @@ -157,6 +157,9 @@ type property OnMouseMove; property OnMouseDown; property OnMouseUp; + property OnMouseWheel; + property OnMouseWheelDown; + property OnMouseWheelUp; property OnDragOver; property OnDragDrop; property OnEndDrag; diff --git a/components/rx/trunk/rxctrls.pas b/components/rx/trunk/rxctrls.pas index cd3a01736..4f0353181 100644 --- a/components/rx/trunk/rxctrls.pas +++ b/components/rx/trunk/rxctrls.pas @@ -539,6 +539,9 @@ type property OnMouseUp; property OnMouseEnter; property OnMouseLeave; + property OnMouseWheel; + property OnMouseWheelDown; + property OnMouseWheelUp; property OnStartDrag; property OnContextPopup; property OnEndDock; @@ -662,6 +665,9 @@ type property OnMouseDown; property OnMouseMove; property OnMouseUp; + property OnMouseWheel; + property OnMouseWheelDown; + property OnMouseWheelUp; property OnStartDrag; property OnContextPopup; property OnEndDock; diff --git a/components/rx/trunk/rxdaterangeeditunit.pas b/components/rx/trunk/rxdaterangeeditunit.pas index 345ffe8a0..1d3838592 100644 --- a/components/rx/trunk/rxdaterangeeditunit.pas +++ b/components/rx/trunk/rxdaterangeeditunit.pas @@ -107,6 +107,9 @@ type property OnClick; property OnEnter; property OnExit; + property OnMouseWheel; + property OnMouseWheelDown; + property OnMouseWheelUp; end; implementation diff --git a/components/rx/trunk/rxdbcolorbox.pas b/components/rx/trunk/rxdbcolorbox.pas index 0f886553a..f5b4a8179 100644 --- a/components/rx/trunk/rxdbcolorbox.pas +++ b/components/rx/trunk/rxdbcolorbox.pas @@ -139,6 +139,9 @@ type property OnMouseLeave; property OnMouseMove; property OnMouseUp; + property OnMouseWheel; + property OnMouseWheelDown; + property OnMouseWheelUp; property OnStartDrag; property OnSelect; property OnUTF8KeyPress; diff --git a/components/rx/trunk/rxdbcomb.pas b/components/rx/trunk/rxdbcomb.pas index 043807bbb..224da1a09 100644 --- a/components/rx/trunk/rxdbcomb.pas +++ b/components/rx/trunk/rxdbcomb.pas @@ -157,6 +157,9 @@ type property OnMouseDown; property OnMouseMove; property OnMouseUp; + property OnMouseWheel; + property OnMouseWheelDown; + property OnMouseWheelUp; property OnSelect; property OnStartDrag; property OnUTF8KeyPress; diff --git a/components/rx/trunk/rxdbctrls.pas b/components/rx/trunk/rxdbctrls.pas index a95477473..80105c591 100644 --- a/components/rx/trunk/rxdbctrls.pas +++ b/components/rx/trunk/rxdbctrls.pas @@ -88,6 +88,9 @@ type property OnMouseDown; property OnMouseMove; property OnMouseUp; + property OnMouseWheel; + property OnMouseWheelDown; + property OnMouseWheelUp; property OnStartDock; property OnStartDrag; property Orientation; diff --git a/components/rx/trunk/rxdbgrid.pas b/components/rx/trunk/rxdbgrid.pas index 109407dd5..ac27243d6 100644 --- a/components/rx/trunk/rxdbgrid.pas +++ b/components/rx/trunk/rxdbgrid.pas @@ -860,6 +860,9 @@ type property OnMouseDown; property OnMouseMove; property OnMouseUp; + property OnMouseWheel; + property OnMouseWheelDown; + property OnMouseWheelUp; property OnPrepareCanvas; property OnSelectEditor; property OnStartDock; diff --git a/components/rx/trunk/rxdbspinedit.pas b/components/rx/trunk/rxdbspinedit.pas index cf5be91f0..3a7a17cda 100644 --- a/components/rx/trunk/rxdbspinedit.pas +++ b/components/rx/trunk/rxdbspinedit.pas @@ -113,6 +113,9 @@ type property OnMouseDown; property OnMouseMove; property OnMouseUp; + property OnMouseWheel; + property OnMouseWheelDown; + property OnMouseWheelUp; property OnResize; property OnUTF8KeyPress; property ParentFont; diff --git a/components/rx/trunk/rxdbtimeedit.pas b/components/rx/trunk/rxdbtimeedit.pas index ff389136a..71db8ed13 100644 --- a/components/rx/trunk/rxdbtimeedit.pas +++ b/components/rx/trunk/rxdbtimeedit.pas @@ -121,6 +121,9 @@ type property OnMouseDown; property OnMouseMove; property OnMouseUp; + property OnMouseWheel; + property OnMouseWheelDown; + property OnMouseWheelUp; property OnStartDrag; property OnUTF8KeyPress; property ParentColor; diff --git a/components/rx/trunk/rxdice.pas b/components/rx/trunk/rxdice.pas index b20596275..b087c93c9 100644 --- a/components/rx/trunk/rxdice.pas +++ b/components/rx/trunk/rxdice.pas @@ -113,6 +113,9 @@ type property OnMouseMove; property OnMouseDown; property OnMouseUp; + property OnMouseWheel; + property OnMouseWheelDown; + property OnMouseWheelUp; property OnKeyDown; property OnKeyUp; property OnKeyPress; diff --git a/components/rx/trunk/rxlookup.pas b/components/rx/trunk/rxlookup.pas index 8d85121e1..feb56ef69 100644 --- a/components/rx/trunk/rxlookup.pas +++ b/components/rx/trunk/rxlookup.pas @@ -356,6 +356,9 @@ type property OnMouseDown; property OnMouseMove; property OnMouseUp; + property OnMouseWheel; + property OnMouseWheelDown; + property OnMouseWheelUp; property OnStartDrag; property OnGetGridCellProps; property OnSelect; diff --git a/components/rx/trunk/rxspin.pas b/components/rx/trunk/rxspin.pas index 4d339b006..6974a48f6 100644 --- a/components/rx/trunk/rxspin.pas +++ b/components/rx/trunk/rxspin.pas @@ -198,13 +198,11 @@ type property DragMode; property Enabled; property Font; -//{$IFDEF RX_D4} property Anchors; property BiDiMode; property Constraints; property DragKind; property ParentBiDiMode; -//{$ENDIF} property MaxLength; property ParentColor; // property ParentCtl3D; @@ -232,12 +230,10 @@ type property OnMouseDown; property OnMouseMove; property OnMouseUp; -//{$IFDEF RX_D5} - property OnContextPopup; -//{$ENDIF} -//{$IFDEF RX_D4} + property OnMouseWheel; property OnMouseWheelDown; property OnMouseWheelUp; + property OnContextPopup; property OnEndDock; property OnStartDock; //{$ENDIF} diff --git a/components/rx/trunk/rxswitch.pas b/components/rx/trunk/rxswitch.pas index 0f2ed1df2..8543741d2 100644 --- a/components/rx/trunk/rxswitch.pas +++ b/components/rx/trunk/rxswitch.pas @@ -133,6 +133,9 @@ type property OnMouseMove; property OnMouseDown; property OnMouseUp; + property OnMouseWheel; + property OnMouseWheelDown; + property OnMouseWheelUp; property OnKeyDown; property OnKeyUp; property OnKeyPress; diff --git a/components/rx/trunk/rxtimeedit.pas b/components/rx/trunk/rxtimeedit.pas index caa6a0658..6cfbbb8c9 100644 --- a/components/rx/trunk/rxtimeedit.pas +++ b/components/rx/trunk/rxtimeedit.pas @@ -109,6 +109,9 @@ type property OnMouseDown; property OnMouseMove; property OnMouseUp; + property OnMouseWheel; + property OnMouseWheelDown; + property OnMouseWheelUp; property OnStartDrag; property OnUTF8KeyPress; property ParentColor; diff --git a/components/rx/trunk/rxtoolbar.pas b/components/rx/trunk/rxtoolbar.pas index e4d434f4c..9310af5c6 100644 --- a/components/rx/trunk/rxtoolbar.pas +++ b/components/rx/trunk/rxtoolbar.pas @@ -273,6 +273,9 @@ type property OnMouseDown; property OnMouseMove; property OnMouseUp; + property OnMouseWheel; + property OnMouseWheelDown; + property OnMouseWheelUp; property OnResize; property OnStartDrag; end; @@ -559,8 +562,8 @@ begin if ((FLastDrawFlagsA and DFCS_FLAT) <> 0) and ((FLastDrawFlagsA and DFCS_PUSHED) = 0) and (tpGlyphPopup in TToolbarItems(FOwnerItem.Collection).FToolPanel.Options) and FFullPush then begin - FImageList.Draw(Canvas, Offset.X, Offset.Y, TCustomAction(Action).ImageIndex, false); -// FImageList.Draw(Canvas, Offset.X, Offset.Y, TCustomAction(Action).ImageIndex, gdeDisabled); +// FImageList.Draw(Canvas, Offset.X, Offset.Y, TCustomAction(Action).ImageIndex, false); + FImageList.Draw(Canvas, Offset.X, Offset.Y, TCustomAction(Action).ImageIndex, gdeShadowed); Dec(Offset.X, 2); Dec(Offset.Y, 2); end; diff --git a/components/rx/trunk/rxviewspanel.pas b/components/rx/trunk/rxviewspanel.pas index 88adba177..a297b8c18 100644 --- a/components/rx/trunk/rxviewspanel.pas +++ b/components/rx/trunk/rxviewspanel.pas @@ -179,6 +179,9 @@ type property OnMouseLeave; property OnMouseMove; property OnMouseUp; + property OnMouseWheel; + property OnMouseWheelDown; + property OnMouseWheelUp; property OnResize; property OnStartDock; property OnStartDrag; diff --git a/components/rx/trunk/tooledit.pas b/components/rx/trunk/tooledit.pas index 3d7a39257..77361ecbe 100644 --- a/components/rx/trunk/tooledit.pas +++ b/components/rx/trunk/tooledit.pas @@ -219,6 +219,9 @@ type Property OnMouseDown; Property OnMouseMove; property OnMouseUp; + property OnMouseWheel; + property OnMouseWheelDown; + property OnMouseWheelUp; property OnResize; end;