From 2d643365e0ee9278d055a2fd8d60c8744748b50d Mon Sep 17 00:00:00 2001
From: vincents <vincents@lazarus-ide.org>
Date: Fri, 10 Aug 2007 11:02:39 +0000
Subject: [PATCH] LCL: TCustomSpeedbutton now uses TControl.OnMouseEnter and
 TControl.OnMouseLeave from Luiz (bug #9399)

git-svn-id: trunk@11775 -
---
 lcl/buttons.pp              | 6 +-----
 lcl/include/speedbutton.inc | 6 ++----
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/lcl/buttons.pp b/lcl/buttons.pp
index f008199827..6b0bddf3ae 100644
--- a/lcl/buttons.pp
+++ b/lcl/buttons.pp
@@ -206,8 +206,6 @@ type
     FLayout: TButtonLayout;
     FMargin: integer;
     FMouseInControl: Boolean;
-    FOnMouseEnter: TNotifyEvent;
-    FOnMouseExit: TNotifyEvent;
     FShortcut: TShortCut;
     FShowAccelChar: boolean;
     FShowCaption: boolean;
@@ -279,8 +277,6 @@ type
     property ShowCaption: boolean read FShowCaption write SetShowCaption default true;
     property Spacing: integer read FSpacing write SetSpacing default 4;
     property Transparent: Boolean read FTransparent write SetTransparent default true;
-    property OnMouseEnter: TNotifyEvent read FOnMouseEnter write FOnMouseEnter;
-    property OnMouseExit: TNotifyEvent read FOnMouseExit write FOnMouseExit;
   end;
 
 
@@ -312,7 +308,7 @@ type
     property OnDblClick;
     property OnMouseDown;
     property OnMouseEnter;
-    property OnMouseExit;
+    property OnMouseLeave;
     property OnMouseMove;
     property OnMouseUp;
     property OnPaint;
diff --git a/lcl/include/speedbutton.inc b/lcl/include/speedbutton.inc
index 86e2c93a97..f54460c7fb 100644
--- a/lcl/include/speedbutton.inc
+++ b/lcl/include/speedbutton.inc
@@ -907,14 +907,13 @@ end;
  ------------------------------------------------------------------------------}
 procedure TCustomSpeedButton.MouseEnter;
 begin
-  inherited MouseEnter;
   if csDesigning in ComponentState then exit;
   if not FMouseInControl
   and Enabled and (GetCapture = 0)
   then begin
     FMouseInControl := True;
     UpdateState(true);
-    if Assigned(FOnMouseEnter) then FOnMouseEnter(Self);
+    inherited MouseEnter;
   end;
 end;
 
@@ -926,7 +925,6 @@ end;
  ------------------------------------------------------------------------------}
 procedure TCustomSpeedButton.MouseLeave;
 begin
-  inherited MouseLeave;
   if csDesigning in ComponentState then exit;
   ///DebugLn(['TCustomSpeedButton.MouseLeave ',DbgSName(Self),' FMouseInControl=',FMouseInControl,' FDragging=',FDragging]);
   if FMouseInControl
@@ -939,7 +937,7 @@ begin
         FDragging:=false;
       end;
       UpdateState(true);
-      if Assigned(FOnMouseExit) then FOnMouseExit(Self);
+      inherited MouseLeave;
     end;
   end;
 end;