summaryrefslogtreecommitdiffstats
path: root/src/styles/qcommonstyle.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-11-03 20:34:34 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-11-03 20:34:34 -0500
commit2f1ea4569a70464a94289c6fe2c463ce8b649e67 (patch)
tree7bf2c174f6579289d1eef59cf8446d93ba35e5e6 /src/styles/qcommonstyle.cpp
parent573f18421513021eee6b951b542574cdaf1e868a (diff)
downloadtqt3-2f1ea4569a70464a94289c6fe2c463ce8b649e67.tar.gz
tqt3-2f1ea4569a70464a94289c6fe2c463ce8b649e67.zip
Automated update from Qt3
Diffstat (limited to 'src/styles/qcommonstyle.cpp')
-rw-r--r--src/styles/qcommonstyle.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/styles/qcommonstyle.cpp b/src/styles/qcommonstyle.cpp
index 402354c62..19b5aa444 100644
--- a/src/styles/qcommonstyle.cpp
+++ b/src/styles/qcommonstyle.cpp
@@ -66,6 +66,7 @@
#include "ntqradiobutton.h"
#include "ntqbitmap.h"
#include "ntqprogressbar.h"
+#include "ntqlistbox.h"
#include "private/qdialogbuttons_p.h"
#include <limits.h>
#include <ntqpixmap.h>
@@ -265,6 +266,7 @@ TQStyleControlElementData populateControlElementDataFromWidget(const TQWidget* w
if (populateReliantFields) {
ceData.fgColor = widget->foregroundColor();
ceData.colorGroup = widget->colorGroup();
+ ceData.paletteBgColor = widget->paletteBackgroundColor();
}
ceData.geometry = widget->geometry();
ceData.rect = widget->rect();
@@ -504,6 +506,7 @@ TQStyleControlElementData populateControlElementDataFromWidget(const TQWidget* w
if (populateReliantFields) {
ceData.viewportData.fgColor = viewport->foregroundColor();
ceData.viewportData.colorGroup = viewport->colorGroup();
+ ceData.viewportData.paletteBgColor = viewport->paletteBackgroundColor();
}
ceData.viewportData.geometry = viewport->geometry();
ceData.viewportData.rect = viewport->rect();
@@ -524,6 +527,10 @@ TQStyleControlElementData populateControlElementDataFromWidget(const TQWidget* w
if (lineEdit) {
ceData.comboBoxLineEditFlags = getControlElementFlagsForObject(lineEdit, ceData.widgetObjectTypes, TQStyleOption::Default);
}
+ const TQListBox* listBox = cb->listBox();
+ if (listBox) {
+ ceData.comboBoxListBoxFlags = getControlElementFlagsForObject(listBox, ceData.widgetObjectTypes, TQStyleOption::Default);
+ }
}
}
if (ceData.widgetObjectTypes.contains("TQFrame")) {
@@ -554,6 +561,7 @@ TQStyleControlElementData populateControlElementDataFromWidget(const TQWidget* w
if (populateReliantFields) {
ceData.parentWidgetData.fgColor = parentWidget->foregroundColor();
ceData.parentWidgetData.colorGroup = parentWidget->colorGroup();
+ ceData.parentWidgetData.paletteBgColor = parentWidget->paletteBackgroundColor();
}
ceData.parentWidgetData.geometry = parentWidget->geometry();
ceData.parentWidgetData.rect = parentWidget->rect();
@@ -580,6 +588,7 @@ TQStyleControlElementData populateControlElementDataFromWidget(const TQWidget* w
if (toolbar) {
ceData.toolBarData.orientation = toolbar->orientation();
}
+ ceData.parentWidgetFlags = getControlElementFlagsForObject(parentWidget, ceData.parentWidgetData.widgetObjectTypes, TQStyleOption::Default, populateReliantFields);
}
TQCheckListItem *item = opt.checkListItem();