Refresh control element data structures before executing style object event handlers

This resolves Bug 1816
Fix FTBFS in style examples

1 files changed, 11 insertions, 11 deletions

diff --git a/examples/themes/wood.cpp b/examples/themes/wood.cpp
index 085fdea..11af503 100644
--- a/examples/themes/wood.cpp
+++ b/examples/themes/wood.cpp
@@ -769,7 +769,7 @@ NorwegianWoodStyle::NorwegianWoodStyle() : QWindowsStyle()
 /*!
   Reimplementation from QStyle
  */
-void NorwegianWoodStyle::applicationPolish( QStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr )
+void NorwegianWoodStyle::applicationPolish( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
 {
 	oldPalette = ceData.palette;
 	
@@ -871,7 +871,7 @@ void NorwegianWoodStyle::applicationPolish( QStyleControlElementData ceData, Con
 	applicationActionRequest(ceData, elementFlags, ptr, AAR_SetPalette, QStyleApplicationActionRequestData(QPalette(active, disabled, active), TRUE));
 }
 
-void NorwegianWoodStyle::applicationUnPolish( QStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr )
+void NorwegianWoodStyle::applicationUnPolish( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
 {
 	applicationActionRequest(ceData, elementFlags, ptr, AAR_SetPalette, QStyleApplicationActionRequestData(oldPalette, TRUE));
 }
@@ -879,7 +879,7 @@ void NorwegianWoodStyle::applicationUnPolish( QStyleControlElementData ceData, C
 /*!
   Reimplementation from QStyle
  */
-void NorwegianWoodStyle::polish( QStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr )
+void NorwegianWoodStyle::polish( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
 {
 	// the polish function sets some widgets to transparent mode and
 	// some to translate background mode in order to get the full
@@ -896,7 +896,7 @@ void NorwegianWoodStyle::polish( QStyleControlElementData ceData, ControlElement
 	}
 }
 
-void NorwegianWoodStyle::unPolish( QStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr )
+void NorwegianWoodStyle::unPolish( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
 {
 	// the polish function sets some widgets to transparent mode and
 	// some to translate background mode in order to get the full
@@ -915,7 +915,7 @@ void NorwegianWoodStyle::unPolish( QStyleControlElementData ceData, ControlEleme
 
 void NorwegianWoodStyle::drawPrimitive( PrimitiveElement pe,
 					QPainter *p,
-					QStyleControlElementData ceData,
+					const QStyleControlElementData &ceData,
 					ControlElementFlags elementFlags,
 					const QRect &r,
 					const QColorGroup &cg,
@@ -986,7 +986,7 @@ void NorwegianWoodStyle::drawPrimitive( PrimitiveElement pe,
 
 void NorwegianWoodStyle::drawControl( ControlElement element,
 				      QPainter *p,
-				      QStyleControlElementData ceData,
+				      const QStyleControlElementData &ceData,
 				      ControlElementFlags elementFlags,
 				      const QRect &r,
 				      const QColorGroup &cg,
@@ -1095,7 +1095,7 @@ void NorwegianWoodStyle::drawControl( ControlElement element,
 
 void NorwegianWoodStyle::drawControlMask( ControlElement element,
 					  QPainter *p,
-					  QStyleControlElementData ceData,
+					  const QStyleControlElementData &ceData,
 					  ControlElementFlags elementFlags,
 					  const QRect &r,
 					  const QStyleOption& opt,
@@ -1118,7 +1118,7 @@ void NorwegianWoodStyle::drawControlMask( ControlElement element,
 
 void NorwegianWoodStyle::drawComplexControl( ComplexControl cc,
 					     QPainter *p,
-					     QStyleControlElementData ceData,
+					     const QStyleControlElementData &ceData,
 					     ControlElementFlags elementFlags,
 					     const QRect &r,
 					     const QColorGroup &cg,
@@ -1192,7 +1192,7 @@ void NorwegianWoodStyle::drawComplexControlMask( ComplexControl control,
 }
 
 QRect NorwegianWoodStyle::querySubControlMetrics( ComplexControl control,
-						  QStyleControlElementData ceData,
+						  const QStyleControlElementData &ceData,
 						  ControlElementFlags elementFlags,
 						  SubControl sc,
 						  const QStyleOption& opt,
@@ -1250,7 +1250,7 @@ QRect NorwegianWoodStyle::querySubControlMetrics( ComplexControl control,
     return rect;
 }
 
-QRect NorwegianWoodStyle::subRect( SubRect sr, const QStyleControlElementData ceData, const ControlElementFlags elementFlags, const QWidget * widget ) const
+QRect NorwegianWoodStyle::subRect( SubRect sr, const QStyleControlElementData &ceData, const ControlElementFlags elementFlags, const QWidget * widget ) const
 {
     QRect r;
     switch ( sr ) {
@@ -1355,7 +1355,7 @@ static void get_combo_parameters( const QRect &r,
 static inline int buttonthickness( int d )
 { return  d > 20 ? 5 : ( d < 10 ? 2: 3 ); }
 
-void NorwegianWoodStyle::drawSemicircleButton( QPainter *p, QStyleControlElementData ceData,
+void NorwegianWoodStyle::drawSemicircleButton( QPainter *p, const QStyleControlElementData &ceData,
 					       ControlElementFlags elementFlags, const QRect &r,
 					       int dir, bool sunken,
 					       const QColorGroup &g ) const