summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2012-10-31 23:30:53 -0500
committerTimothy Pearson <[email protected]>2012-10-31 23:30:53 -0500
commitaf6b35e2ebfea3633e92b6f9496dd06ef8523c79 (patch)
tree3ef429b1f8bf9026376751268b4b54de81ccdef7
parentb0bd2889fa1058eec74c303b10cf8724a4c5efe2 (diff)
downloadtqt3-af6b35e2ebfea3633e92b6f9496dd06ef8523c79.tar.gz
tqt3-af6b35e2ebfea3633e92b6f9496dd06ef8523c79.zip
Automated update from Qt3
-rw-r--r--src/kernel/ntqstyle.h6
-rw-r--r--src/styles/qcommonstyle.cpp4
2 files changed, 10 insertions, 0 deletions
diff --git a/src/kernel/ntqstyle.h b/src/kernel/ntqstyle.h
index 994eff811..90f4eacff 100644
--- a/src/kernel/ntqstyle.h
+++ b/src/kernel/ntqstyle.h
@@ -178,6 +178,11 @@ class TQStyleControlElementDockWidgetData {
TQt::Orientation areaOrientation;
};
+class TQStyleControlElementToolBarWidgetData {
+ public:
+ TQt::Orientation orientation;
+};
+
class TQStyleControlElementGenericWidgetData {
public:
TQStringList widgetObjectTypes;
@@ -270,6 +275,7 @@ class Q_EXPORT TQStyleControlElementData {
TQ_UINT32 frameStyle;
TQRect sliderRect;
TQPainter* activePainter;
+ TQStyleControlElementToolBarWidgetData toolBarData;
public:
TQStyleControlElementData();
diff --git a/src/styles/qcommonstyle.cpp b/src/styles/qcommonstyle.cpp
index 213f04781..402354c62 100644
--- a/src/styles/qcommonstyle.cpp
+++ b/src/styles/qcommonstyle.cpp
@@ -576,6 +576,10 @@ TQStyleControlElementData populateControlElementDataFromWidget(const TQWidget* w
}
ceData.dwData.closeEnabled = dw->isCloseEnabled();
}
+ const TQToolBar * toolbar = dynamic_cast<const TQToolBar*>(parentWidget);
+ if (toolbar) {
+ ceData.toolBarData.orientation = toolbar->orientation();
+ }
}
TQCheckListItem *item = opt.checkListItem();