diff options
| author | Timothy Pearson <[email protected]> | 2014-11-21 21:59:09 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2014-11-21 21:59:09 -0600 |
| commit | 38755f930a7c05e1fad9845349845056fadcaa7c (patch) | |
| tree | 855d9e5ac1cc7c3c5e6c44c9dc1f4b539eaaf563 | |
| parent | 117b166ca68c8bf56dfdaae735ccfa33b7f30a16 (diff) | |
| download | tqt3-38755f930a7c05e1fad9845349845056fadcaa7c.tar.gz tqt3-38755f930a7c05e1fad9845349845056fadcaa7c.zip | |
Automated update from Qt3
| -rw-r--r-- | src/kernel/qstyle.cpp | 2 | ||||
| -rw-r--r-- | 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 9960e1d33..4204c9941 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 4b129e8e0..a851abb2a 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; } |