Automated update from Qt3

pull/1/head
Timothy Pearson 10 years ago
parent 117b166ca6
commit 38755f930a

@ -783,7 +783,7 @@ void TQStyle::polish( TQPalette&)
*/ */
void TQStyle::polishPopupMenu( TQPopupMenu *pm ) { void TQStyle::polishPopupMenu( TQPopupMenu *pm ) {
const TQStyleControlElementData &ceData = populateControlElementDataFromWidget(pm, TQStyleOption()); const TQStyleControlElementData &ceData = populateControlElementDataFromWidget(pm, TQStyleOption());
unPolish(ceData, getControlElementFlagsForObject(pm, TQStyleOption()), pm); polish(ceData, getControlElementFlagsForObject(pm, TQStyleOption()), pm);
} }
/*! /*!

@ -1222,7 +1222,7 @@ TQSize TQPopupMenu::updateSize(bool force_update, bool do_resize)
continue; continue;
int itemh = itemHeight( mi ); int itemh = itemHeight( mi );
sz = style().sizeFromContents(TQStyle::CT_PopupMenuItem, this, sz = style().sizeFromContents(TQStyle::CT_PopupMenuItem, this,
TQSize(0, itemh), TQStyleOption(mi,maxPMWidth)); TQSize(0, itemh), TQStyleOption(mi,maxPMWidth));
sz = sz.expandedTo(TQSize(itemw, sz.height())); sz = sz.expandedTo(TQSize(itemw, sz.height()));
@ -1233,7 +1233,7 @@ TQSize TQPopupMenu::updateSize(bool force_update, bool do_resize)
y = contentsRect().y(); y = contentsRect().y();
x +=itemw; x +=itemw;
} }
if ( mi->widget() ) if ( mi->widget() )
mi->widget()->setGeometry( x, y, itemw, mi->widget()->height() ); mi->widget()->setGeometry( x, y, itemw, mi->widget()->height() );
y += itemh; y += itemh;
} }

Loading…
Cancel
Save