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

1 files changed, 20 insertions, 25 deletions

diff --git a/styles/dotnet/dotnet.cpp b/styles/dotnet/dotnet.cpp
index 107f182b..88ac440d 100644
--- a/styles/dotnet/dotnet.cpp
+++ b/styles/dotnet/dotnet.cpp
@@ -109,7 +109,7 @@ bool dotNETstyle::inheritsKHTML(const TQWidget* w) const
 	}
 }
 
-void dotNETstyle::polish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr)
+void dotNETstyle::polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
 {
     	if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
 		TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
@@ -149,7 +149,7 @@ void dotNETstyle::polish(TQStyleControlElementData ceData, ControlElementFlags e
 	}
 }
 
-void dotNETstyle::unPolish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr)
+void dotNETstyle::unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
 {
 	winstyle->unPolish(ceData, elementFlags, ptr);
 
@@ -378,7 +378,7 @@ void dotNETstyle::renderPanel(TQPainter *p,
 
 void dotNETstyle::drawKStylePrimitive(KStylePrimitive kpe,
                                       TQPainter *p,
-                                      TQStyleControlElementData ceData,
+                                      const TQStyleControlElementData &ceData,
                                       ControlElementFlags elementFlags,
                                       const TQRect &r,
                                       const TQColorGroup &cg,
@@ -427,7 +427,7 @@ void dotNETstyle::drawKStylePrimitive(KStylePrimitive kpe,
 // This function draws primitive elements as well as their masks.
 void dotNETstyle::drawPrimitive(TQ_PrimitiveElement pe,
                                 TQPainter *p,
-                                TQStyleControlElementData ceData,
+                                const TQStyleControlElementData &ceData,
                                 ControlElementFlags elementFlags,
                                 const TQRect &r,
                                 const TQColorGroup &cg,
@@ -799,7 +799,7 @@ void dotNETstyle::drawPrimitive(TQ_PrimitiveElement pe,
 
 void dotNETstyle::drawControl(TQ_ControlElement element,
                               TQPainter *p,
-                              TQStyleControlElementData ceData,
+                              const TQStyleControlElementData &ceData,
                               ControlElementFlags elementFlags,
                               const TQRect &r,
                               const TQColorGroup &cg,
@@ -1088,9 +1088,8 @@ void dotNETstyle::drawControl(TQ_ControlElement element,
 		}
 
 		case CE_PushButton: {
-			TQPushButton *button = (TQPushButton *)widget;
 			TQRect br = r;
-			bool btnDefault = button->isDefault();
+			bool btnDefault = (elementFlags & CEF_IsDefault);
 
 			static int di = pixelMetric(PM_ButtonDefaultIndicator, ceData, elementFlags);
 			br.addCoords(di, di, -di, -di);
@@ -1406,7 +1405,7 @@ void dotNETstyle::drawControl(TQ_ControlElement element,
 
 void dotNETstyle::drawControlMask(TQ_ControlElement element,
                                   TQPainter *p,
-                                  TQStyleControlElementData ceData,
+                                  const TQStyleControlElementData &ceData,
                                   ControlElementFlags elementFlags,
                                   const TQRect &r,
                                   const TQStyleOption &opt,
@@ -1436,7 +1435,7 @@ void dotNETstyle::drawControlMask(TQ_ControlElement element,
 
 void dotNETstyle::drawComplexControlMask(ComplexControl c,
                                          TQPainter *p,
-                                         const TQStyleControlElementData ceData,
+                                         const TQStyleControlElementData &ceData,
                                          const ControlElementFlags elementFlags,
                                          const TQRect &r,
                                          const TQStyleOption &o,
@@ -1465,7 +1464,7 @@ void dotNETstyle::drawComplexControlMask(ComplexControl c,
 
 void dotNETstyle::drawComplexControl(ComplexControl control,
                                      TQPainter *p,
-                                     TQStyleControlElementData ceData,
+                                     const TQStyleControlElementData &ceData,
                                      ControlElementFlags elementFlags,
                                      const TQRect &r,
                                      const TQColorGroup &cg,
@@ -1581,8 +1580,6 @@ void dotNETstyle::drawComplexControl(ComplexControl control,
 	//	TOOLBUTTON
 	//	----------
 		case CC_ToolButton: {
-			const TQToolButton *tb = (const TQToolButton *) widget;
-
 			TQRect button, menuarea;
 			button   = querySubControlMetrics(control, ceData, elementFlags, SC_ToolButton, opt, widget);
 			menuarea = querySubControlMetrics(control, ceData, elementFlags, SC_ToolButtonMenu, opt, widget);
@@ -1600,11 +1597,9 @@ void dotNETstyle::drawComplexControl(ComplexControl control,
 			//	If we're pressed, on, or raised...
 				if (bflags & (Style_Down | Style_On | Style_Raised)) {
 					drawPrimitive(PE_ButtonTool, p, ceData, elementFlags, button, cg, bflags, opt);
-				} else if (tb->parentWidget() &&
-				           tb->parentWidget()->backgroundPixmap() &&
-				           !tb->parentWidget()->backgroundPixmap()->isNull()) {
-					TQPixmap pixmap = *(tb->parentWidget()->backgroundPixmap());
-					p->drawTiledPixmap( r, pixmap, tb->pos() );
+				} else if (!ceData.parentWidgetData.bgPixmap.isNull()) {
+					TQPixmap pixmap = ceData.parentWidgetData.bgPixmap;
+					p->drawTiledPixmap( r, pixmap, ceData.pos );
 				}
 			}
 
@@ -1616,8 +1611,8 @@ void dotNETstyle::drawComplexControl(ComplexControl control,
 				drawPrimitive(PE_ArrowDown, p, ceData, elementFlags, menuarea, cg, mflags, opt);
 			}
 
-			if (tb->hasFocus() && !tb->focusProxy()) {
-				TQRect fr = tb->rect();
+			if ((elementFlags & CEF_HasFocus) && !(elementFlags & CEF_HasFocusProxy)) {
+				TQRect fr = ceData.rect;
 				fr.addCoords(2, 2, -2, -2);
 				drawPrimitive(PE_FocusRect, p, ceData, elementFlags, fr, cg);
 			}
@@ -1723,7 +1718,7 @@ void dotNETstyle::drawComplexControl(ComplexControl control,
 }
 
 
-TQRect dotNETstyle::subRect(SubRect r, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget *widget) const
+TQRect dotNETstyle::subRect(SubRect r, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *widget) const
 {
 // Don't use KStyles progressbar subrect
 	switch (r) {
@@ -1751,7 +1746,7 @@ TQRect dotNETstyle::subRect(SubRect r, const TQStyleControlElementData ceData, c
 }
 
 TQRect dotNETstyle::querySubControlMetrics(ComplexControl control,
-                                          TQStyleControlElementData ceData,
+                                          const TQStyleControlElementData &ceData,
                                           ControlElementFlags elementFlags,
                                           SubControl subcontrol,
                                           const TQStyleOption &opt,
@@ -1809,7 +1804,7 @@ TQRect dotNETstyle::querySubControlMetrics(ComplexControl control,
 	return KStyle::querySubControlMetrics(control, ceData, elementFlags, subcontrol, opt, widget);
 }
 
-int dotNETstyle::pixelMetric(PixelMetric m, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget) const
+int dotNETstyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget) const
 {
 	switch(m) {
 	//	TABS
@@ -1912,7 +1907,7 @@ int dotNETstyle::pixelMetric(PixelMetric m, TQStyleControlElementData ceData, Co
 
 
 TQSize dotNETstyle::sizeFromContents(ContentsType t,
-                                    TQStyleControlElementData ceData,
+                                    const TQStyleControlElementData &ceData,
                                     ControlElementFlags elementFlags,
                                     const TQSize &s,
                                     const TQStyleOption &opt,
@@ -2070,7 +2065,7 @@ void dotNETstyle::slotDestroyed()
 	m_widgets.remove( (TQWidget*) sender() );
 }
 
-bool dotNETstyle::objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags, void* source, TQEvent *ev )
+bool dotNETstyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags, void* source, TQEvent *ev )
 {
 	if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) {
 		TQObject* obj = reinterpret_cast<TQObject*>(source);
@@ -2107,7 +2102,7 @@ bool dotNETstyle::objectEventHandler( TQStyleControlElementData ceData, ControlE
 	return false;
 }
 
-int dotNETstyle::styleHint(StyleHint sh, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQStyleOption &opt, TQStyleHintReturn *returnData, const TQWidget *w) const
+int dotNETstyle::styleHint(StyleHint sh, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption &opt, TQStyleHintReturn *returnData, const TQWidget *w) const
 {
 	int ret;