summaryrefslogtreecommitdiffstats
path: root/tqtinterface/qt4/src/widgets/tqpopupmenu.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2011-07-24 03:10:05 -0500
committerTimothy Pearson <[email protected]>2011-07-24 03:10:05 -0500
commit596c6587c8e5263027705426647b43a5105f3bcd (patch)
treeb864ce18ebbf1185a337cbbe4a817d08eac8dc57 /tqtinterface/qt4/src/widgets/tqpopupmenu.cpp
parentd3f7a9d6f1b8f6e24fb49aaa8caeaa7623ae48b5 (diff)
downloadexperimental-596c6587c8e5263027705426647b43a5105f3bcd.tar.gz
experimental-596c6587c8e5263027705426647b43a5105f3bcd.zip
Fixed FTBFS due to prior commit
Diffstat (limited to 'tqtinterface/qt4/src/widgets/tqpopupmenu.cpp')
-rw-r--r--tqtinterface/qt4/src/widgets/tqpopupmenu.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tqtinterface/qt4/src/widgets/tqpopupmenu.cpp b/tqtinterface/qt4/src/widgets/tqpopupmenu.cpp
index 993c065..89f525a 100644
--- a/tqtinterface/qt4/src/widgets/tqpopupmenu.cpp
+++ b/tqtinterface/qt4/src/widgets/tqpopupmenu.cpp
@@ -603,7 +603,7 @@ void TQPopupMenu::popup( const TQPoint &pos, int indexAtPoint )
if( tqparent == NULL )
tqparent = TQApplication::widgetAt( pos );
if( tqparent == NULL )
- tqparent = tqApp->activeWindow();
+ tqparent = TQT_TQWIDGET(tqApp->activeWindow());
if( tqparent != NULL )
x11SetWindowTransient( tqparent );
}
@@ -2387,7 +2387,7 @@ void TQPopupMenu::subMenuTimer() {
TQPoint p;
TQSize ps = popup->tqsizeHint();
// GUI Style
- int gs = style().tqstyleHint(TQStyle::SH_GUIStyle);
+ int gs = tqstyle().tqstyleHint(TQStyle::SH_GUIStyle);
int arrowHMargin, arrowVMargin;
if (gs == GtkStyle) {
arrowHMargin = gtkArrowHMargin;