1 files changed, 51 insertions, 19 deletions

diff --git a/domino/domino.h b/domino/domino.h
index 115748e..e243456 100644
--- a/domino/domino.h
+++ b/domino/domino.h
@@ -108,21 +108,25 @@ public:
 		Palette_Widget
 	};
 	
-	void polish(TQApplication* app );
-	void polish(TQWidget* widget );
+	void applicationPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
+	void polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
 	void polish( TQPalette &p );
-	void unPolish(TQWidget* widget );
+	void unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
 	
 	void drawTDEStylePrimitive(TDEStylePrimitive kpe,
 				TQPainter* p,
-				const TQWidget* widget,
+				const TQStyleControlElementData &ceData,
+				ControlElementFlags elementFlags,
 				const TQRect &r,
 				const TQColorGroup &cg,
 				SFlags flags = Style_Default,
-				const TQStyleOption& = TQStyleOption::Default ) const;
+				const TQStyleOption& = TQStyleOption::Default,
+				const TQWidget* widget = 0 ) const;
 
 	void drawPrimitive(PrimitiveElement pe,
 				TQPainter *p,
+				const TQStyleControlElementData &ceData,
+				ControlElementFlags elementFlags,
 				const TQRect &r,
 				const TQColorGroup &cg,
 				SFlags flags = Style_Default,
@@ -130,46 +134,71 @@ public:
 
 	void drawControl(ControlElement element,
 				TQPainter *p,
-				const TQWidget *widget,
+				const TQStyleControlElementData &ceData,
+				ControlElementFlags elementFlags,
 				const TQRect &r,
 				const TQColorGroup &cg,
 				SFlags flags = Style_Default,
-				const TQStyleOption& = TQStyleOption::Default ) const;
+				const TQStyleOption& = TQStyleOption::Default,
+				const TQWidget *widget = 0 ) const;
 
-	void drawControlMask( ControlElement, TQPainter *, const TQWidget *, const TQRect &, const TQStyleOption &) const;
+	void drawControlMask( TQ_ControlElement,
+				TQPainter *,
+				const TQStyleControlElementData &ceData,
+				ControlElementFlags elementFlags,
+				const TQRect &,
+				const TQStyleOption &,
+				const TQWidget *) const;
 
-	void drawComplexControl(ComplexControl control,
+	void drawComplexControl(TQ_ComplexControl control,
 				TQPainter *p,
-				const TQWidget *widget,
+				const TQStyleControlElementData &ceData,
+				ControlElementFlags elementFlags,
 				const TQRect &r,
 				const TQColorGroup &cg,
 				SFlags flags = Style_Default,
 				SCFlags controls = SC_All,
 				SCFlags active = SC_None,
-				const TQStyleOption& = TQStyleOption::Default ) const;
+				const TQStyleOption& = TQStyleOption::Default,
+				const TQWidget *widget = 0 ) const;
 
 	int pixelMetric(PixelMetric m,
+				const TQStyleControlElementData &ceData,
+				ControlElementFlags elementFlags,
 				const TQWidget *widget = 0 ) const;
 
 	TQRect subRect(SubRect r,
+				const TQStyleControlElementData &ceData,
+				ControlElementFlags elementFlags,
 				const TQWidget *widget ) const;
 
 	TQRect querySubControlMetrics(ComplexControl control,
-				const TQWidget *widget,
+				const TQStyleControlElementData &ceData,
+				ControlElementFlags elementFlags,
 				SubControl subcontrol,
-				const TQStyleOption &opt = TQStyleOption::Default ) const;
+				const TQStyleOption &opt = TQStyleOption::Default,
+				const TQWidget *widget = 0 ) const;
 
 	TQSize sizeFromContents(TQStyle::ContentsType t,
-				const TQWidget *w,
+				const TQStyleControlElementData &ceData,
+				ControlElementFlags elementFlags,
 				const TQSize &s,
-				const TQStyleOption &o) const;
+				const TQStyleOption &o,
+				const TQWidget *w = 0) const;
 
-	int styleHint(StyleHint, const TQWidget * = 0,
+	int styleHint(TQ_StyleHint,
+				const TQStyleControlElementData &ceData,
+				ControlElementFlags elementFlags,
 				const TQStyleOption & = TQStyleOption::Default,
-				TQStyleHintReturn * = 0 ) const;
+				TQStyleHintReturn * = 0,
+				const TQWidget * = 0 ) const;
 	
 	
-	TQPixmap stylePixmap(StylePixmap stylepixmap, const TQWidget* widget, const TQStyleOption& opt) const;
+	TQPixmap stylePixmap(StylePixmap stylepixmap,
+				const TQStyleControlElementData &ceData,
+				ControlElementFlags elementFlags,
+				const TQStyleOption& opt,
+				const TQWidget* widget = 0) const;
 	
 	void drawItem( TQPainter *p, const TQRect &r,
 		       int flags, const TQColorGroup &g, bool enabled,
@@ -371,7 +400,10 @@ protected:
 	DSurface headerSurface;
 	DSurface checkItemSurface;
 	
-	bool eventFilter(TQObject *, TQEvent *);
+	virtual bool objectEventHandler( const TQStyleControlElementData &ceData,
+			ControlElementFlags elementFlags,
+			void* source,
+			TQEvent *ev );
 	
 	TQString configMode;
 	void removeCachedSbPix(const TQColor &color) {