diff options
author | Graeme Geldenhuys <graemeg@gmail.com> | 2014-08-20 02:11:13 +0100 |
---|---|---|
committer | Graeme Geldenhuys <graemeg@gmail.com> | 2014-08-20 02:11:13 +0100 |
commit | c8acc2c1666015daeb3038c838e5018c0ecd8903 (patch) | |
tree | 5ad2edaf0e5fb6be146491226dca4d915333d80d /src/gui/fpg_button.pas | |
parent | c45010b6370b50f8e6192ddb7dc3d7762c8c29f7 (diff) | |
parent | d0d8573b046e5020d05c86a970d303084de19b7d (diff) | |
download | fpGUI-c8acc2c1666015daeb3038c838e5018c0ecd8903.tar.xz |
Merge branch 'release-1.2' into master
Diffstat (limited to 'src/gui/fpg_button.pas')
-rw-r--r-- | src/gui/fpg_button.pas | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/gui/fpg_button.pas b/src/gui/fpg_button.pas index 3bc026de..0cbb1397 100644 --- a/src/gui/fpg_button.pas +++ b/src/gui/fpg_button.pas @@ -1,7 +1,7 @@ { fpGUI - Free Pascal GUI Toolkit - Copyright (C) 2006 - 2010 See the file AUTHORS.txt, included in this + Copyright (C) 2006 - 2013 See the file AUTHORS.txt, included in this distribution, for details of the copyright. See the file COPYING.modifiedLGPL, included in this distribution, @@ -171,6 +171,9 @@ type property OnDragLeave; property OnDragDrop; property OnDragStartDetected; + property OnEnter; + property OnExit; + property OnKeyPress; property OnMouseDown; property OnMouseExit; property OnMouseEnter; @@ -543,6 +546,9 @@ begin if FEmbedded then Include(lBtnFlags, btfIsEmbedded); + if not Enabled then + Include(lBtnFlags, btfDisabled); + // In the UI Designer we want the button more visible if not (csDesigning in ComponentState) then begin |