summaryrefslogtreecommitdiffstats
path: root/src/widgets/qtoolbox.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-08-07 01:32:24 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-08-07 01:32:24 -0500
commit74dac1c21d3ad1f446874fd29f7e670e77a196b5 (patch)
tree8ff20c2c06d337cdcec36a32afc8bfd9f4120064 /src/widgets/qtoolbox.cpp
parentc73edd8f63289c619c20a8e5d031a24d870c62ee (diff)
downloadtqt3-74dac1c21d3ad1f446874fd29f7e670e77a196b5.tar.gz
tqt3-74dac1c21d3ad1f446874fd29f7e670e77a196b5.zip
Automated update from Qt3
Diffstat (limited to 'src/widgets/qtoolbox.cpp')
-rw-r--r--src/widgets/qtoolbox.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/widgets/qtoolbox.cpp b/src/widgets/qtoolbox.cpp
index 74f1e6046..d1c30012c 100644
--- a/src/widgets/qtoolbox.cpp
+++ b/src/widgets/qtoolbox.cpp
@@ -240,8 +240,9 @@ void TQToolBoxButton::drawButton( TQPainter *p )
fill = &cg.color( TQPalette::foregroundRoleFromMode( tb->backgroundMode() ) );
int alignment = AlignLeft | AlignVCenter | ShowPrefix;
- if (!style().styleHint(TQStyle::SH_UnderlineAccelerator, this))
+ if ((!style().styleHint(TQStyle::SH_UnderlineAccelerator, this)) || ((style().styleHint(TQStyle::SH_HideUnderlineAcceleratorWhenAltUp, this)) && (!style().acceleratorsShown()))) {
alignment |= NoAccel;
+ }
style().drawItem( p, tr, alignment, cg,
isEnabled(), 0, txt, -1, fill );