summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-08-27 16:39:09 -0500
committerDarrell Anderson <humanreadable@yahoo.com>2012-08-27 16:39:09 -0500
commitb819aed7f271db4986260ac0c96d819f3c64c545 (patch)
treef01ffed6d06096864741a248c5e2e1aa7fb3db6f
parentaefb9003365f2d471dda76617fba35b2d859b0a9 (diff)
parent7527f04a05483260f725ae9509d4e268190df821 (diff)
downloadtqt3-b819aed7f271db4986260ac0c96d819f3c64c545.tar.gz
tqt3-b819aed7f271db4986260ac0c96d819f3c64c545.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
-rw-r--r--src/kernel/qstyle.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/kernel/qstyle.cpp b/src/kernel/qstyle.cpp
index 2195382e7..7aa144091 100644
--- a/src/kernel/qstyle.cpp
+++ b/src/kernel/qstyle.cpp
@@ -2422,7 +2422,7 @@ void TQStyle::drawPrimitive( PrimitiveElement pe,
}
}
- TQStyleControlElementData ceData = populateControlElementDataFromWidget(widget, TQStyleOption());
+ TQStyleControlElementData ceData = populateControlElementDataFromWidget(widget, opt);
drawPrimitive(pe, p, ceData, getControlElementFlagsForObject(widget, ceData.widgetObjectTypes, TQStyleOption()), r, cg, flags, opt);
}
@@ -2485,7 +2485,7 @@ void TQStyle::drawComplexControl( ComplexControl control,
}
#endif
- TQStyleControlElementData ceData = populateControlElementDataFromWidget(widget, TQStyleOption());
+ TQStyleControlElementData ceData = populateControlElementDataFromWidget(widget, opt);
drawComplexControl(control, p, ceData, getControlElementFlagsForObject(widget, ceData.widgetObjectTypes, TQStyleOption()), r, cg, flags, controls, active, opt, widget);
}
@@ -2495,7 +2495,7 @@ void TQStyle::drawComplexControlMask( ComplexControl control,
const TQRect &r,
const TQStyleOption& opt ) const
{
- TQStyleControlElementData ceData = populateControlElementDataFromWidget(widget, TQStyleOption());
+ TQStyleControlElementData ceData = populateControlElementDataFromWidget(widget, opt);
drawComplexControlMask(control, p, ceData, getControlElementFlagsForObject(widget, ceData.widgetObjectTypes, TQStyleOption()), r, opt, widget);
}
@@ -2511,7 +2511,7 @@ TQRect TQStyle::querySubControlMetrics( ComplexControl control,
}
#endif
- TQStyleControlElementData ceData = populateControlElementDataFromWidget(widget, TQStyleOption(), false);
+ TQStyleControlElementData ceData = populateControlElementDataFromWidget(widget, opt, false);
return querySubControlMetrics(control, ceData, getControlElementFlagsForObject(widget, ceData.widgetObjectTypes, TQStyleOption()), sc, opt, widget);
}
@@ -2544,19 +2544,19 @@ TQSize TQStyle::sizeFromContents(ContentsType contents,
}
#endif
- TQStyleControlElementData ceData = populateControlElementDataFromWidget(widget, TQStyleOption());
+ TQStyleControlElementData ceData = populateControlElementDataFromWidget(widget, opt);
return sizeFromContents(contents, ceData, getControlElementFlagsForObject(widget, ceData.widgetObjectTypes, TQStyleOption()), contentsSize, opt, widget);
}
int TQStyle::styleHint(StyleHint sh, const TQWidget * w, const TQStyleOption &so, TQStyleHintReturn *shr) const
{
- TQStyleControlElementData ceData = populateControlElementDataFromWidget(w, TQStyleOption(), false);
+ TQStyleControlElementData ceData = populateControlElementDataFromWidget(w, so, false);
return styleHint(sh, ceData, getControlElementFlagsForObject(w, ceData.widgetObjectTypes, TQStyleOption(), false), so, shr, w);
}
TQPixmap TQStyle::stylePixmap(StylePixmap sp, const TQWidget *w, const TQStyleOption &so) const
{
- TQStyleControlElementData ceData = populateControlElementDataFromWidget(w, TQStyleOption());
+ TQStyleControlElementData ceData = populateControlElementDataFromWidget(w, so);
return stylePixmap(sp, ceData, getControlElementFlagsForObject(w, ceData.widgetObjectTypes, TQStyleOption()), so, w);
}