Branch: master

38755f93 2014-11-21 21:59:09 Timothy Pearson
Automated update from Qt3
M src/kernel/qstyle.cpp
M src/widgets/qpopupmenu.cpp
diff --git a/src/kernel/qstyle.cpp b/src/kernel/qstyle.cpp
index 9960e1d..4204c99 100644
--- a/src/kernel/qstyle.cpp
+++ b/src/kernel/qstyle.cpp
@@ -783,7 +783,7 @@
 */
 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 4b129e8..a851abb 100644
--- a/src/widgets/qpopupmenu.cpp
+++ b/src/widgets/qpopupmenu.cpp
@@ -1222,7 +1222,7 @@
 		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 @@
 		y = contentsRect().y();
 		x +=itemw;
 	    }
-	    if ( mi->widget() ) 
+	    if ( mi->widget() )
 		mi->widget()->setGeometry( x, y, itemw, mi->widget()->height() );
 	    y += itemh;
 	}