summaryrefslogtreecommitdiffstats
path: root/src/widgets/qpopupmenu.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/widgets/qpopupmenu.cpp')
-rw-r--r--src/widgets/qpopupmenu.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/widgets/qpopupmenu.cpp b/src/widgets/qpopupmenu.cpp
index f3fd9599e..96629dcbe 100644
--- a/src/widgets/qpopupmenu.cpp
+++ b/src/widgets/qpopupmenu.cpp
@@ -303,7 +303,7 @@ TQPopupMenu::TQPopupMenu( TQWidget *parent, const char *name )
connectModalRecursionSafety = 0;
setFocusPolicy( StrongFocus );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
x11SetWindowType( X11WindowTypePopup );
#endif
}
@@ -373,7 +373,7 @@ void TQPopupMenu::menuContentsChanged()
// here the part that can't be delayed
TQMenuData::menuContentsChanged();
badSize = TRUE; // might change the size
-#if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
mac_dirty_popup = 1;
#endif
if( pendingDelayedContentsChanges )
@@ -404,7 +404,7 @@ void TQPopupMenu::performDelayedContentsChanged()
p->updateSize(TRUE);
p->update();
}
-#if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
mac_dirty_popup = 1;
#endif
}
@@ -468,7 +468,7 @@ void TQPopupMenu::frameChanged()
TQRect TQPopupMenu::screenRect( const TQPoint& pos )
{
int screen_num = TQApplication::desktop()->screenNumber( pos );
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
return TQApplication::desktop()->availableGeometry( screen_num );
#else
return TQApplication::desktop()->screenGeometry( screen_num );
@@ -497,7 +497,7 @@ void TQPopupMenu::popup( const TQPoint &pos, int indexAtPoint )
if ( isVisible() || !isEnabled() )
return;
-#if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
if( macPopupMenu(pos, indexAtPoint ))
return;
#endif
@@ -569,7 +569,7 @@ void TQPopupMenu::popup( const TQPoint &pos, int indexAtPoint )
if ( y < sy )
y = sy;
}
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
#ifndef TQT_NO_MENUBAR
TQMenuData *top = this; // find top level
while ( top->parentMenu )
@@ -2762,7 +2762,7 @@ void TQPopupMenu::toggleTearOff()
geometry().topLeft(), FALSE );
p->mitems->setAutoDelete( FALSE );
p->tornOff = TRUE;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
p->x11SetWindowType( X11WindowTypeMenu );
#endif
for ( TQMenuItemListIt it( *mitems ); it.current(); ++it ) {