From 38755f930a7c05e1fad9845349845056fadcaa7c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 21 Nov 2014 21:59:09 -0600 Subject: [PATCH] Automated update from Qt3 --- src/kernel/qstyle.cpp | 2 +- src/widgets/qpopupmenu.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/kernel/qstyle.cpp b/src/kernel/qstyle.cpp index 9960e1d3..4204c994 100644 --- a/src/kernel/qstyle.cpp +++ b/src/kernel/qstyle.cpp @@ -783,7 +783,7 @@ void TQStyle::polish( TQPalette&) */ void TQStyle::polishPopupMenu( TQPopupMenu *pm ) { const TQStyleControlElementData &ceData = populateControlElementDataFromWidget(pm, TQStyleOption()); - unPolish(ceData, getControlElementFlagsForObject(pm, TQStyleOption()), pm); + polish(ceData, getControlElementFlagsForObject(pm, TQStyleOption()), pm); } /*! diff --git a/src/widgets/qpopupmenu.cpp b/src/widgets/qpopupmenu.cpp index 4b129e8e..a851abb2 100644 --- a/src/widgets/qpopupmenu.cpp +++ b/src/widgets/qpopupmenu.cpp @@ -1222,7 +1222,7 @@ TQSize TQPopupMenu::updateSize(bool force_update, bool do_resize) continue; int itemh = itemHeight( mi ); - + sz = style().sizeFromContents(TQStyle::CT_PopupMenuItem, this, TQSize(0, itemh), TQStyleOption(mi,maxPMWidth)); sz = sz.expandedTo(TQSize(itemw, sz.height())); @@ -1233,7 +1233,7 @@ TQSize TQPopupMenu::updateSize(bool force_update, bool do_resize) y = contentsRect().y(); x +=itemw; } - if ( mi->widget() ) + if ( mi->widget() ) mi->widget()->setGeometry( x, y, itemw, mi->widget()->height() ); y += itemh; }