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

1 files changed, 28 insertions, 15 deletions

diff --git a/src/styles/qwindowsstyle.h b/src/styles/qwindowsstyle.h
index 5ad82b0..d768a04 100644
--- a/src/styles/qwindowsstyle.h
+++ b/src/styles/qwindowsstyle.h
@@ -61,11 +61,11 @@ public:
     QWindowsStyle();
     ~QWindowsStyle();
 
-    void polish(QApplication*);
-    void unPolish(QApplication*);
+    void applicationPolish(QStyleControlElementData ceData, ControlElementFlags elementFlags, void *);
+    void applicationUnPolish(QStyleControlElementData ceData, ControlElementFlags elementFlags, void *);
 
-    void polish(QWidget*);
-    void unPolish(QWidget*);
+    void polish(QStyleControlElementData ceData, ControlElementFlags elementFlags, void *);
+    void unPolish(QStyleControlElementData ceData, ControlElementFlags elementFlags, void *);
 
     void polish( QPalette & );
 
@@ -74,6 +74,8 @@ public:
     // new stuff
     void drawPrimitive( PrimitiveElement pe,
 			QPainter *p,
+			QStyleControlElementData ceData,
+			ControlElementFlags elementFlags,
 			const QRect &r,
 			const QColorGroup &cg,
 			SFlags flags = Style_Default,
@@ -81,15 +83,18 @@ public:
 
     void drawControl( ControlElement element,
 		      QPainter *p,
-		      const QWidget *widget,
+		      QStyleControlElementData ceData,
+		      ControlElementFlags elementFlags,
 		      const QRect &r,
 		      const QColorGroup &cg,
 		      SFlags flags = Style_Default,
-		      const QStyleOption& = QStyleOption::Default ) const;
+		      const QStyleOption& = QStyleOption::Default,
+		      const QWidget *widget = 0 ) const;
 
     void drawComplexControl( ComplexControl control,
 			     QPainter* p,
-			     const QWidget* widget,
+			     QStyleControlElementData ceData,
+			     ControlElementFlags elementFlags,
 			     const QRect& r,
 			     const QColorGroup& cg,
 			     SFlags flags = Style_Default,
@@ -99,25 +104,33 @@ public:
 			     SCFlags sub = (uint)SC_All,
 #endif
 			     SCFlags subActive = SC_None,
-			     const QStyleOption& = QStyleOption::Default ) const;
+			     const QStyleOption& = QStyleOption::Default,
+			     const QWidget* widget = 0 ) const;
 
     int pixelMetric( PixelMetric metric,
+		     QStyleControlElementData ceData,
+		     ControlElementFlags elementFlags,
 		     const QWidget *widget = 0 ) const;
 
     QSize sizeFromContents( ContentsType contents,
-			    const QWidget *widget,
+			    QStyleControlElementData ceData,
+			    ControlElementFlags elementFlags,
 			    const QSize &contentsSize,
-			    const QStyleOption& = QStyleOption::Default ) const;
+			    const QStyleOption& = QStyleOption::Default,
+			    const QWidget *widget = 0 ) const;
 
-    int styleHint(StyleHint sh, const QWidget *, const QStyleOption & = QStyleOption::Default,
-		  QStyleHintReturn* = 0) const;
+    int styleHint(StyleHint sh, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QStyleOption & = QStyleOption::Default,
+		  QStyleHintReturn* = 0, const QWidget* = 0) const;
 
     QPixmap stylePixmap( StylePixmap stylepixmap,
-			 const QWidget *widget = 0,
-			 const QStyleOption& = QStyleOption::Default ) const;
+			 QStyleControlElementData ceData,
+			 ControlElementFlags elementFlags,
+			 const QStyleOption& = QStyleOption::Default,
+			 const QWidget *widget = 0 ) const;
 
-    QRect subRect( SubRect r, const QWidget *widget ) const;
+    QRect subRect( SubRect r, const QStyleControlElementData ceData, const ControlElementFlags elementFlags, const QWidget *widget ) const;
 
+    bool objectEventHandler( QStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, QEvent *e );
 
 private:
     class Private;