summaryrefslogtreecommitdiffstats
path: root/src/styles
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-12-01 23:30:53 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-12-01 23:30:53 -0600
commit6955a7ebe3c3a0ae2af416fc57ca1f3e9af0ecc3 (patch)
tree76f40d456bda2b31029c7fb0354cc22102f435d6 /src/styles
parent4c50ba8f9e58dc81abaf1407cc8b203c28288370 (diff)
downloadtqt3-6955a7ebe3c3a0ae2af416fc57ca1f3e9af0ecc3.tar.gz
tqt3-6955a7ebe3c3a0ae2af416fc57ca1f3e9af0ecc3.zip
Automated update from Qt3
Diffstat (limited to 'src/styles')
-rw-r--r--src/styles/qcommonstyle.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/styles/qcommonstyle.cpp b/src/styles/qcommonstyle.cpp
index 41ed19d0b..ad8669827 100644
--- a/src/styles/qcommonstyle.cpp
+++ b/src/styles/qcommonstyle.cpp
@@ -347,6 +347,11 @@ TQStyleControlElementData populateControlElementDataFromWidget(const TQWidget* w
const TQButton *button = dynamic_cast<const TQButton*>(widget);
if (button) {
ceData.text = button->text();
+ const TQPixmap* paletteBgPixmap = 0;
+ paletteBgPixmap = button->paletteBackgroundPixmap();
+ if (paletteBgPixmap) {
+ ceData.paletteBgPixmap = *paletteBgPixmap;
+ }
}
}
if (ceData.widgetObjectTypes.contains("TQTabBar")) {
@@ -3215,6 +3220,13 @@ int TQCommonStyle::styleHint(StyleHint sh, const TQStyleControlElementData &ceDa
ret = 0;
break;
+ case SH_PopupMenu_SubMenuArrowColorActiveEnabled:
+ case SH_PopupMenu_SubMenuArrowColorActiveDisabled:
+ case SH_PopupMenu_SubMenuArrowColorInactiveEnabled:
+ case SH_PopupMenu_SubMenuArrowColorInactiveDisabled:
+ ret = -1;
+ break;
+
default:
ret = 0;
break;