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

1 files changed, 25 insertions, 16 deletions

diff --git a/src/styles/ntqsgistyle.h b/src/styles/ntqsgistyle.h
index b724a5b84..73be2ae84 100644
--- a/src/styles/ntqsgistyle.h
+++ b/src/styles/ntqsgistyle.h
@@ -67,13 +67,15 @@ public:
 #if !defined(Q_NO_USING_KEYWORD)
     using TQMotifStyle::polish;
 #endif
-    void polish( TQWidget* );
-    void unPolish( TQWidget* );
-    void polish( TQApplication* );
-    void unPolish( TQApplication* );
+    void polish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * );
+    void unPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * );
+    void applicationPolish( 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,
@@ -81,15 +83,18 @@ 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 drawComplexControl( ComplexControl control,
 			     TQPainter *p,
-			     const TQWidget* widget,
+			     TQStyleControlElementData ceData,
+			     ControlElementFlags elementFlags,
 			     const TQRect& r,
 			     const TQColorGroup& cg,
 			     SFlags how = Style_Default,
@@ -99,23 +104,27 @@ public:
 			     SCFlags sub = (uint)SC_All,
 #endif
 			     SCFlags subActive = SC_None,
-			     const TQStyleOption& = TQStyleOption::Default ) const;
+			     const TQStyleOption& = TQStyleOption::Default,
+			     const TQWidget* widget = 0 ) const;
 
-    int pixelMetric( PixelMetric metric, const TQWidget *widget = 0 ) const;
+    int pixelMetric( PixelMetric metric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget = 0 ) const;
 
     TQSize sizeFromContents( ContentsType contents,
-			    const TQWidget *widget,
+			    TQStyleControlElementData ceData,
+			    ControlElementFlags elementFlags,
 			    const TQSize &contentsSize,
-			    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, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget ) 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;
 
-protected:
-    bool eventFilter( TQObject*, TQEvent*);
+    bool objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQEvent *e );
 
 private:
     TQSGIStylePrivate *d;