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

1 files changed, 28 insertions, 16 deletions

diff --git a/examples/themes/wood.h b/examples/themes/wood.h
index dd2d10624..a572e24bb 100644
--- a/examples/themes/wood.h
+++ b/examples/themes/wood.h
@@ -26,13 +26,15 @@ class NorwegianWoodStyle : public TQWindowsStyle
 {
 public:
     NorwegianWoodStyle();
-    void polish( TQApplication*);
-    void polish( TQWidget* );
-    void unPolish( TQWidget* );
-    void unPolish( TQApplication*);
+    void applicationPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * );
+    void polish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * );
+    void unPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * );
+    void applicationUnPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * );
 
     void drawPrimitive( PrimitiveElement pe,
 			TQPainter *p,
+			TQStyleControlElementData ceData,
+			ControlElementFlags elementFlags,
 			const TQRect &r,
 			const TQColorGroup &cg,
 			SFlags flags = Style_Default,
@@ -40,44 +42,54 @@ public:
 
     void drawControl( ControlElement element,
 		      TQPainter *p,
-		      const TQWidget *widget,
+		      TQStyleControlElementData ceData,
+		      ControlElementFlags elementFlags,
 		      const TQRect &r,
 		      const TQColorGroup &cg,
 		      SFlags how = Style_Default,
-		      const TQStyleOption& = TQStyleOption::Default ) const;
+		      const TQStyleOption& = TQStyleOption::Default,
+		      const TQWidget *widget = 0 ) const;
 
     void drawControlMask( ControlElement element,
 			  TQPainter *p,
-			  const TQWidget *widget,
+			  TQStyleControlElementData ceData,
+			  ControlElementFlags elementFlags,
 			  const TQRect &r,
-			  const TQStyleOption& = TQStyleOption::Default ) const;
+			  const TQStyleOption& = TQStyleOption::Default,
+			  const TQWidget *widget = 0 ) const;
 
     void drawComplexControl( ComplexControl cc,
 			     TQPainter *p,
-			     const TQWidget *widget,
+			     TQStyleControlElementData ceData,
+			     ControlElementFlags elementFlags,
 			     const TQRect &r,
 			     const TQColorGroup &cg,
 			     SFlags how = Style_Default,
 			     SCFlags sub = SC_All,
 			     SCFlags subActive = SC_None,
-			     const TQStyleOption& = TQStyleOption::Default ) const;
+			     const TQStyleOption& = TQStyleOption::Default,
+			     const TQWidget *widget = 0 ) const;
 
     void drawComplexControlMask( ComplexControl control,
 				 TQPainter *p,
-				 const TQWidget *widget,
+				 const TQStyleControlElementData ceData,
+				 const ControlElementFlags elementFlags,
 				 const TQRect &r,
-				 const TQStyleOption& = TQStyleOption::Default ) const;
+				 const TQStyleOption& = TQStyleOption::Default,
+				 const TQWidget *widget = 0 ) const;
 
     TQRect querySubControlMetrics( ComplexControl control,
-				  const TQWidget *widget,
+				  TQStyleControlElementData ceData,
+				  ControlElementFlags elementFlags,
 				  SubControl sc,
-				  const TQStyleOption& = TQStyleOption::Default ) const;
+				  const TQStyleOption& = TQStyleOption::Default,
+				  const TQWidget *widget = 0 ) const;
 
-    TQRect subRect( SubRect r, const TQWidget *widget ) const;
+    TQRect subRect( SubRect r, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget *widget ) const;
 
 
 private:
-    void drawSemicircleButton(TQPainter *p, const TQRect &r, int dir,
+    void drawSemicircleButton(TQPainter *p, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &r, int dir,
 			      bool sunken, const TQColorGroup &g ) const;
     TQPalette oldPalette;
     TQPixmap *sunkenDark;