summaryrefslogtreecommitdiffstats
path: root/src/styles/qwindowsstyle.cpp
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-08-09 13:00:30 -0500
committerDarrell Anderson <humanreadable@yahoo.com>2012-08-09 13:00:30 -0500
commit34ddcfd05b2b4772eeb70493726e0f8c8b40a3af (patch)
tree8b1d100ee7f3ff0a997338b2e0424392121c09fa /src/styles/qwindowsstyle.cpp
parent785106b36c47923c338b6d3d61584eea448863ca (diff)
parentb6053b1b40b51e3d9b1b679a8a1751e5472e06e2 (diff)
downloadtqt3-34ddcfd05b2b4772eeb70493726e0f8c8b40a3af.tar.gz
tqt3-34ddcfd05b2b4772eeb70493726e0f8c8b40a3af.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src/styles/qwindowsstyle.cpp')
-rw-r--r--src/styles/qwindowsstyle.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/styles/qwindowsstyle.cpp b/src/styles/qwindowsstyle.cpp
index 5a1289dca..dae52362f 100644
--- a/src/styles/qwindowsstyle.cpp
+++ b/src/styles/qwindowsstyle.cpp
@@ -1155,11 +1155,12 @@ TQSize TQWindowsStyle::sizeFromContents( ContentsType contents,
/*! \reimp
*/
-void TQWindowsStyle::polishPopupMenu( TQPopupMenu* p)
+void TQWindowsStyle::polishPopupMenu( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr )
{
#ifndef QT_NO_POPUPMENU
- if ( !p->testWState( WState_Polished ) )
- p->setCheckable( TRUE );
+ if ( !(ceData.windowState & WState_Polished ) ) {
+ widgetActionRequest(ceData, elementFlags, ptr, WAR_SetCheckable);
+ }
#endif
}