Changeset 277 for trunk/src/gui/widgets/qmenu.cpp

Timestamp:

Nov 2, 2009, 3:00:35 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: QSystemTrayIcon: Implemented reaction to notification messages from the system tray and emitting them as signals.

File:

• trunk/src/gui/widgets/qmenu.cpp (modified) (3 diffs)

trunk/src/gui/widgets/qmenu.cpp

@@ -165 +165 @@
 }
 
-//Windows and KDE allows menus to cover the taskbar, while GNOME and Mac don't
+// Windows, OS/2 and KDE allows menus to cover the taskbar, while GNOME and Mac don't
 QRect QMenuPrivate::popupGeometry(int screen) const
 {
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_WS_PM)
     return QApplication::desktop()->screenGeometry(screen);
 #elif defined Q_WS_X11
@@ -1096 +1096 @@
             QList< QPointer<QWidget> > list;
             for(QWidget *widget = q->parentWidget(); widget; ) {
-                if (qobject_cast<QMenu*>(widget) 
+                if (qobject_cast<QMenu*>(widget)
 #ifndef QT_NO_MENUBAR
                     || qobject_cast<QMenuBar*>(widget)
@@ -1262 +1262 @@
     is represented vertically and rendered by QStyle. In addition, actions
     can have a text label, an optional icon drawn on the very left side,
-    and shortcut key sequence such as "Ctrl+X". 
+    and shortcut key sequence such as "Ctrl+X".
 
     The existing actions held by a menu can be found with actions().