Changeset 169 for trunk/src

Timestamp:

Sep 8, 2009, 5:29:13 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Fixed the build after disabling the qt3support module: some components still used deprecated Qt3 methods internally.

Location:

trunk/src/gui

Files:

• kernel/qapplication_pm.cpp (modified) (3 diffs)
• kernel/qkeymapper_pm.cpp (modified) (1 diff)
• kernel/qwidget_pm.cpp (modified) (1 diff)
• painting/qregion_pm.cpp (modified) (1 diff)

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -1397 +1397 @@
     } else {
         if (type == QEvent::MouseButtonPress && !isActiveWindow())
-            setActiveWindow();
+            eWindow();
 
         gpos = qmsg.ptl;
@@ -1480 +1480 @@
 #ifndef QT_NO_CONTEXTMENU
             if (type == QEvent::ContextMenu) {
-                QContextMenuEvent e(QContextMenuEvent::Mouse, pos, globalPos, state);
+                QContextMenuEvent e(QContextMenuEvent::Mouse, pos, globalPos,
+                                    Qt::KeyboardModifiers(state & Qt::KeyboardModifierMask));
                 res = QApplication::sendSpontaneousEvent(target, &e);
                 res = res && e.isAccepted();
@@ -1550 +1551 @@
 #ifndef QT_NO_CONTEXTMENU
         if (type == QEvent::ContextMenu) {
-            QContextMenuEvent e(QContextMenuEvent::Mouse, pos, globalPos, state);
+            QContextMenuEvent e(QContextMenuEvent::Mouse, pos, globalPos,
+                                Qt::KeyboardModifiers(state & Qt::KeyboardModifierMask));
             res = QApplication::sendSpontaneousEvent(widget, &e);
             res = res && e.isAccepted();

trunk/src/gui/kernel/qkeymapper_pm.cpp

@@ -45 +45 @@
 #include "qapplication_p.h"
 #include "qevent_p.h"
+
 
 #include "qt_os2.h"

trunk/src/gui/kernel/qwidget_pm.cpp

@@ -1569 +1569 @@
                 QRect r = QApplication::desktop()->screenGeometry(this);
                 QRect fs(d->frameStrut());
-                r.rLeft() -= fs.left();
-                r.rRight() += fs.right();
-                r.rTop() -= fs.top();
-                r.rBottom() += fs.bottom();
+                fs.adjust(-fs.left(), -fs.top(), fs.right(), fs.bottom());
                 fl |= SWP_ZORDER | SWP_MOVE | SWP_SIZE;
                 WinSetWindowPos(fId, HWND_TOP, r.left(),

trunk/src/gui/painting/qregion_pm.cpp

@@ -160 +160 @@
 {
     HRGN region = 0;
-    QImage image = bitmap.convertToImage();
+    QImage image = bitmap.oImage();
     const int maxrect = 256;
     RECTL rects[maxrect];