From 2f1ea4569a70464a94289c6fe2c463ce8b649e67 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 3 Nov 2012 20:34:34 -0500
Subject: Automated update from Qt3

---
 src/kernel/ntqstyle.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/kernel')

diff --git a/src/kernel/ntqstyle.h b/src/kernel/ntqstyle.h
index 90f4eacff..de5977fe0 100644
--- a/src/kernel/ntqstyle.h
+++ b/src/kernel/ntqstyle.h
@@ -202,6 +202,7 @@ class TQStyleControlElementGenericWidgetData {
 		TQPixmap icon;
 		TQPalette palette;
 		TQFont font;
+		TQColor paletteBgColor;
 };
 
 class TQStyleControlElementTabBarData {
@@ -276,6 +277,9 @@ class Q_EXPORT TQStyleControlElementData {
 		TQRect sliderRect;
 		TQPainter* activePainter;
 		TQStyleControlElementToolBarWidgetData toolBarData;
+		TQ_UINT32 comboBoxListBoxFlags;
+		TQColor paletteBgColor;
+		TQ_UINT32 parentWidgetFlags;
 
 	public:
 		TQStyleControlElementData();
@@ -1050,6 +1054,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
     };
-- 
cgit v1.2.1


From 79dfe5ba7afa55306b325ddcc6cfbe6dd67cf839 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 4 Nov 2012 16:16:59 -0600
Subject: Automated update from Qt3

---
 src/kernel/ntqstyle.h | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'src/kernel')

diff --git a/src/kernel/ntqstyle.h b/src/kernel/ntqstyle.h
index de5977fe0..73543dd99 100644
--- a/src/kernel/ntqstyle.h
+++ b/src/kernel/ntqstyle.h
@@ -203,6 +203,8 @@ class TQStyleControlElementGenericWidgetData {
 		TQPalette palette;
 		TQFont font;
 		TQColor paletteBgColor;
+		TQString name;
+		TQString caption;
 };
 
 class TQStyleControlElementTabBarData {
@@ -280,6 +282,10 @@ class Q_EXPORT TQStyleControlElementData {
 		TQ_UINT32 comboBoxListBoxFlags;
 		TQColor paletteBgColor;
 		TQ_UINT32 parentWidgetFlags;
+		TQString name;
+		TQString caption;
+		TQStyleControlElementGenericWidgetData topLevelWidgetData;
+		TQ_UINT32 topLevelWidgetFlags;
 
 	public:
 		TQStyleControlElementData();
@@ -343,6 +349,7 @@ public:
 	CEF_IsActiveWindow		= 0x00200000,
 	CEF_IsTopLevel			= 0x00400000,
 	CEF_IsVisible			= 0x00800000,
+	CEF_IsShown			= 0x01000000,
 	CEF_HasMouse			= 0x01000000
     };
 
@@ -473,6 +480,8 @@ public:
 	PE_MenuItemIndicatorIconFrame,
 	PE_MenuItemIndicatorCheck,
 
+	PE_ScrollBarTrough,
+
 	// do not add any values below/greater this
 	PE_CustomBase =			0xf000000
     };
-- 
cgit v1.2.1


From deb6f7b222e52035e99fa757e775c01e987a4eb5 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 6 Nov 2012 22:38:16 -0600
Subject: Automated update from Qt3

---
 src/kernel/qstyle.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/kernel')

diff --git a/src/kernel/qstyle.cpp b/src/kernel/qstyle.cpp
index ef31c25ca..f32d73b9a 100644
--- a/src/kernel/qstyle.cpp
+++ b/src/kernel/qstyle.cpp
@@ -2606,6 +2606,12 @@ TQPixmap TQStyle::stylePixmap(StylePixmap sp, const TQWidget *w, const TQStyleOp
 
 TQStyleControlElementData::TQStyleControlElementData() {
 	activePainter = 0;
+	tickMarkSetting = 0;
+	comboBoxLineEditFlags = 0;
+	frameStyle = 0;
+	comboBoxListBoxFlags = 0;
+	parentWidgetFlags = 0;
+	topLevelWidgetFlags = 0;
 }
 
 #endif // QT_NO_STYLE
-- 
cgit v1.2.1