Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/qt3

1 files changed, 19 insertions, 0 deletions

diff --git a/src/kernel/qstyle.h b/src/kernel/qstyle.h
index 111a987..f76b970 100644
--- a/src/kernel/qstyle.h
+++ b/src/kernel/qstyle.h
@@ -202,6 +202,9 @@ class QStyleControlElementGenericWidgetData {
 		QPixmap icon;
 		QPalette palette;
 		QFont font;
+		QColor paletteBgColor;
+		QString name;
+		QString caption;
 };
 
 class QStyleControlElementTabBarData {
@@ -276,6 +279,13 @@ class Q_EXPORT QStyleControlElementData {
 		QRect sliderRect;
 		QPainter* activePainter;
 		QStyleControlElementToolBarWidgetData toolBarData;
+		Q_UINT32 comboBoxListBoxFlags;
+		QColor paletteBgColor;
+		Q_UINT32 parentWidgetFlags;
+		QString name;
+		QString caption;
+		QStyleControlElementGenericWidgetData topLevelWidgetData;
+		Q_UINT32 topLevelWidgetFlags;
 
 	public:
 		QStyleControlElementData();
@@ -339,6 +349,7 @@ public:
 	CEF_IsActiveWindow		= 0x00200000,
 	CEF_IsTopLevel			= 0x00400000,
 	CEF_IsVisible			= 0x00800000,
+	CEF_IsShown			= 0x01000000,
 	CEF_HasMouse			= 0x01000000
     };
 
@@ -469,6 +480,8 @@ public:
 	PE_MenuItemIndicatorIconFrame,
 	PE_MenuItemIndicatorCheck,
 
+	PE_ScrollBarTrough,
+
 	// do not add any values below/greater this
 	PE_CustomBase =			0xf000000
     };
@@ -1050,6 +1063,12 @@ public:
 	// int - width of menu check column
 	SH_MenuIndicatorColumnWidth,
 
+	// bool - whether or not the lower two button drawing areas should be combined into one
+	SH_ScrollBar_CombineAddLineRegionDrawingAreas,
+
+	// bool - whether or not the upper two button drawing areas should be combined into one
+	SH_ScrollBar_CombineSubLineRegionDrawingAreas,
+
 	// do not add any values below/greater than this
 	SH_CustomBase =		0xf0000000
     };