Automated update from Qt3

1 files changed, 45 insertions, 27 deletions

diff --git a/src/kernel/ntqstyle.h b/src/kernel/ntqstyle.h
index c77ab6e47..20c1b6fd4 100644
--- a/src/kernel/ntqstyle.h
+++ b/src/kernel/ntqstyle.h
@@ -63,26 +63,26 @@ class TQStyleOption {
 public:
     enum StyleOptionDefault { Default };
 
-    TQStyleOption(StyleOptionDefault=Default) : def(TRUE), tb(NULL) {}
+    TQStyleOption(StyleOptionDefault=Default) : def(TRUE), tb(NULL), cli(NULL) {}
 
     // Note: we don't use default arguments since that is unnecessary
     // initialization.
     TQStyleOption(int in1) :
-	def(FALSE), tb(NULL), i1(in1) {}
+	def(FALSE), tb(NULL), i1(in1), cli(NULL) {}
     TQStyleOption(int in1, int in2) :
-	def(FALSE), tb(NULL), i1(in1), i2(in2) {}
+	def(FALSE), tb(NULL), i1(in1), i2(in2), cli(NULL) {}
     TQStyleOption(int in1, int in2, int in3, int in4) :
-	def(FALSE), tb(NULL), i1(in1), i2(in2), i3(in3), i4(in4) {}
-    TQStyleOption(TQMenuItem* m) : def(FALSE), mi(m), tb(NULL) {}
-    TQStyleOption(TQMenuItem* m, int in1) : def(FALSE), mi(m), tb(NULL), i1(in1) {}
-    TQStyleOption(TQMenuItem* m, int in1, int in2) : def(FALSE), mi(m), tb(NULL), i1(in1), i2(in2) {}
-    TQStyleOption(const TQColor& c) : def(FALSE), tb(NULL), cl(&c) {}
-    TQStyleOption(TQTab* t) : def(FALSE), tb(t) {}
-    TQStyleOption(TQListViewItem* i) : def(FALSE), tb(NULL), li(i) {}
+	def(FALSE), tb(NULL), i1(in1), i2(in2), i3(in3), i4(in4), cli(NULL) {}
+    TQStyleOption(TQMenuItem* m) : def(FALSE), mi(m), tb(NULL), cli(NULL) {}
+    TQStyleOption(TQMenuItem* m, int in1) : def(FALSE), mi(m), tb(NULL), i1(in1), cli(NULL) {}
+    TQStyleOption(TQMenuItem* m, int in1, int in2) : def(FALSE), mi(m), tb(NULL), i1(in1), i2(in2), cli(NULL) {}
+    TQStyleOption(const TQColor& c) : def(FALSE), tb(NULL), cl(&c), cli(NULL) {}
+    TQStyleOption(TQTab* t) : def(FALSE), tb(t), cli(NULL) {}
+    TQStyleOption(TQListViewItem* i) : def(FALSE), tb(NULL), li(i), cli(NULL) {}
     TQStyleOption(TQCheckListItem* i) : def(FALSE), tb(NULL), cli(i) {}
-    TQStyleOption(TQt::ArrowType a) : def(FALSE), tb(NULL), i1((int)a) {}
-    TQStyleOption(const TQRect& r) : def(FALSE), tb(NULL), i1(r.x()), i2(r.y()), i3(r.width()),i4(r.height()){}
-    TQStyleOption(TQWidget *w) : def(FALSE), tb(NULL), p1((void*)w) {}
+    TQStyleOption(TQt::ArrowType a) : def(FALSE), tb(NULL), i1((int)a), cli(NULL) {}
+    TQStyleOption(const TQRect& r) : def(FALSE), tb(NULL), i1(r.x()), i2(r.y()), i3(r.width()), i4(r.height()), cli(NULL) {}
+    TQStyleOption(TQWidget *w) : def(FALSE), tb(NULL), cli(NULL), p1((void*)w) {}
 
     bool isDefault() const { return def; }
 
@@ -134,6 +134,14 @@ class TQStyleControlElementPopupMenuData {
 		//
 };
 
+class TQStyleControlElementCheckListItemData {
+	public:
+		bool dataValid;
+		bool enabled;
+		bool hasParent;
+		int height;
+};
+
 class TQStyleControlElementTabBarData {
 	public:
 		int tabCount;
@@ -176,6 +184,7 @@ class TQStyleControlElementGenericWidgetData {
 		TQStringList widgetObjectTypes;
 		bool allDataPopulated;
 		TQt::WFlags wflags;
+		TQt::WindowState windowState;
 		TQPixmap bgPixmap;
 		TQBrush bgBrush;
 		TQColor bgColor;
@@ -196,6 +205,7 @@ class TQStyleControlElementData {
 		TQStringList widgetObjectTypes;
 		bool allDataPopulated;
 		TQt::WFlags wflags;
+		TQt::WindowState windowState;
 		TQPixmap bgPixmap;
 		TQBrush bgBrush;
 		TQColor bgColor;
@@ -237,12 +247,13 @@ class TQStyleControlElementData {
 		TQStyleControlElementGenericWidgetData viewportData;
 		TQStyleControlElementListViewData listViewData;
 		TQStyleControlElementTabBarData tabBarData;
+		TQStyleControlElementCheckListItemData checkListItemData;
 		TQ_UINT32 comboBoxLineEditFlags;
 		TQ_UINT32 frameStyle;
 		TQRect sliderRect;
 };
 
-class TQStyleWidgetActionRequestData {
+class Q_EXPORT TQStyleWidgetActionRequestData {
 	public:
 		TQStyleWidgetActionRequestData();
 		TQStyleWidgetActionRequestData(int metric1, int metric2=0);
@@ -326,7 +337,12 @@ public:
 
     virtual void polish( TQPalette & );
 
-    virtual void polishPopupMenu( TQPopupMenu* ) = 0;
+    // Old API
+    // DEPRECATED
+    virtual void polishPopupMenu( TQPopupMenu* );
+
+    // New API
+    virtual void polishPopupMenu( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * ) = 0;
 
     virtual TQRect itemRect( TQPainter *p, const TQRect &r,
 			    int flags, bool enabled,
@@ -445,7 +461,7 @@ public:
 				const TQRect &r,
 				const TQColorGroup &cg,
 				SFlags flags = Style_Default,
-				const TQStyleOption& = TQStyleOption::Default ) const = 0;
+				const TQStyleOption& = TQStyleOption::Default ) const;
 
     // New API
     virtual void drawPrimitive( PrimitiveElement pe,
@@ -500,7 +516,7 @@ public:
 			      const TQRect &r,
 			      const TQColorGroup &cg,
 			      SFlags how = Style_Default,
-			      const TQStyleOption& = TQStyleOption::Default ) const = 0;
+			      const TQStyleOption& = TQStyleOption::Default ) const;
 
     // New API
     virtual void drawControl( ControlElement element,
@@ -519,7 +535,7 @@ public:
 				  TQPainter *p,
 				  const TQWidget *widget,
 				  const TQRect &r,
-				  const TQStyleOption& = TQStyleOption::Default ) const = 0;
+				  const TQStyleOption& = TQStyleOption::Default ) const;
 
     // New API
     virtual void drawControlMask( ControlElement element,
@@ -572,7 +588,7 @@ public:
 
     // Old API
     // DEPRECATED
-    virtual TQRect subRect( SubRect r, const TQWidget *widget ) const = 0;
+    virtual TQRect subRect( SubRect r, const TQWidget *widget ) const;
 
     // New API
     virtual TQRect subRect( SubRect r, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget *widget ) const = 0;
@@ -653,7 +669,7 @@ public:
 				     SCFlags sub = (uint)SC_All,
 #endif
 				     SCFlags subActive = SC_None,
-				     const TQStyleOption& = TQStyleOption::Default ) const = 0;
+				     const TQStyleOption& = TQStyleOption::Default ) const;
 
     virtual void drawComplexControl( ComplexControl control,
 				     TQPainter *p,
@@ -677,7 +693,7 @@ public:
 					 TQPainter *p,
 					 const TQWidget *widget,
 					 const TQRect &r,
-					 const TQStyleOption& = TQStyleOption::Default ) const = 0;
+					 const TQStyleOption& = TQStyleOption::Default ) const;
 
     // New API
     virtual void drawComplexControlMask( ComplexControl control,
@@ -693,7 +709,7 @@ public:
     virtual TQRect querySubControlMetrics( ComplexControl control,
 					  const TQWidget *widget,
 					  SubControl sc,
-					  const TQStyleOption& = TQStyleOption::Default ) const = 0;
+					  const TQStyleOption& = TQStyleOption::Default ) const;
 
     // New API
     virtual TQRect querySubControlMetrics( ComplexControl control,
@@ -708,7 +724,7 @@ public:
     virtual SubControl querySubControl( ComplexControl control,
 					const TQWidget *widget,
 					const TQPoint &pos,
-					const TQStyleOption& = TQStyleOption::Default ) const = 0;
+					const TQStyleOption& = TQStyleOption::Default ) const;
 
     // New API
     virtual SubControl querySubControl( ComplexControl control,
@@ -790,7 +806,7 @@ public:
     // Old API
     // DEPRECATED
     virtual int pixelMetric( PixelMetric metric,
-			     const TQWidget *widget = 0 ) const = 0;
+			     const TQWidget *widget = 0 ) const;
 
     // New API
     virtual int pixelMetric( PixelMetric metric,
@@ -828,7 +844,7 @@ public:
     virtual TQSize sizeFromContents( ContentsType contents,
 				    const TQWidget *widget,
 				    const TQSize &contentsSize,
-				    const TQStyleOption& = TQStyleOption::Default ) const = 0;
+				    const TQStyleOption& = TQStyleOption::Default ) const;
 
     virtual TQSize sizeFromContents( ContentsType contents,
 				    TQStyleControlElementData ceData,
@@ -992,7 +1008,7 @@ public:
 			   const TQWidget *widget = 0,
 			   const TQStyleOption& = TQStyleOption::Default,
 			   TQStyleHintReturn* returnData = 0
-			   ) const = 0;
+			   ) const;
 
     // New API
     virtual int styleHint( StyleHint stylehint,
@@ -1025,7 +1041,7 @@ public:
     // DEPRECATED
     virtual TQPixmap stylePixmap( StylePixmap stylepixmap,
 				 const TQWidget *widget = 0,
-				 const TQStyleOption& = TQStyleOption::Default ) const = 0;
+				 const TQStyleOption& = TQStyleOption::Default ) const;
 
     virtual TQPixmap stylePixmap( StylePixmap stylepixmap,
 				 TQStyleControlElementData ceData,
@@ -1061,6 +1077,8 @@ public:
 	WAR_RepaintRect,
 	WAR_EnableMouseTracking,
 	WAR_DisableMouseTracking,
+	WAR_SetCheckable,
+	WAR_UnSetCheckable,
 	WAR_FrameSetStyle,
 	WAR_FrameSetLineWidth,
 	WAR_SetLayoutMargin,