Changeset 569 for trunk/src/gui/kernel

Timestamp:

Feb 13, 2010, 6:36:55 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Adopted to 4.6.1 changes.

Location:

trunk/src/gui/kernel

Files:

• qapplication_pm.cpp (modified) (1 diff)
• qguiplatformplugin.cpp (modified) (1 diff)
• qwidget.cpp (modified) (3 diffs)
• qwidget_p.h (modified) (1 diff)
• qwidget_pm.cpp (modified) (6 diffs)

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -2425 +2425 @@
 }
 
+void QApplicationPrivate::initializeMultitouch_sys()
+{
+}
+
+void QApplicationPrivate::cleanupMultitouch_sys()
+{
+}
+
 /*****************************************************************************
   PM session management

trunk/src/gui/kernel/qguiplatformplugin.cpp

@@ -151 +151 @@
 #elif defined(Q_OS_SYMBIAN)
     return QLatin1String("Windows");                    // default style for Symbian without S60
+#elif defined(Q_OS_OS2)
+    return QLatin1String("Windows");                    // default style for OS/2
 #elif defined(Q_WS_X11) && defined(Q_OS_IRIX)
     return QLatin1String("SGI");                        // default style for X11 on IRIX

trunk/src/gui/kernel/qwidget.cpp

@@ -7272 +7272 @@
     // hidden.
     if (wasVisible) {
-#if defined(Q_WS_WIN) || defined(Q_WS_X11) || defined (Q_WS_QWS) || defined(Q_WS_PM) 
+#if defined(Q_WS_WIN) || defined(Q_WS_X11) || defined (Q_WS_QWS) || defined(Q_WS_PM)
         qApp->d_func()->sendSyntheticEnterLeave(q);
 #endif
@@ -9011 +9011 @@
 Qt::InputMethodHints QWidget::inputMethodHints() const
 {
+#ifndef QT_NO_IM
     Q_D(const QWidget);
-#ifndef QT_NO_IM
     return d->imHints;
 #else //QT_NO_IM
@@ -10409 +10409 @@
         if (on && !internalWinId() && testAttribute(Qt::WA_WState_Created))
             d->createWinId();
+#ifndef QT_NO_IM
         if (ic && isEnabled())
             ic->setFocusWidget(focusWidget);

trunk/src/gui/kernel/qwidget_p.h

@@ -712 +712 @@
     HWND effectiveFrameWinId() const;
     void validateObstacles();
+    void reparentChildren();
 #elif defined(Q_WS_WIN) // <--------------------------------------------------------- WIN
     uint noPaintOnScreen : 1; // see qwidget_win.cpp ::paintEngine()

trunk/src/gui/kernel/qwidget_pm.cpp

@@ -1376 +1376 @@
     Q_D(QWidget);
     if (!isWindow() && parentWidget())
-        parentWidget()->d_func()->invalidateBuffer(geometry());
+        parentWidget()->d_func()->invalidateBuffer(d->effectiveRectFor(geometry()));
     d->deactivateWidgetCleanup();
     if (testAttribute(Qt::WA_WState_Created)) {
@@ -1412 +1412 @@
             qt_WinDestroyWindow(id);
         }
-        d->setWinId(0);
+        QT_TRY {
+            d->setWinId(0);
+        } QT_CATCH (const std::bad_alloc &) {
+            // swallow - destructors must not throw
+        }
     }
 }
@@ -1458 +1462 @@
     bool wasCreated = q->testAttribute(Qt::WA_WState_Created);
     if (q->isVisible() && q->parentWidget() && parent != q->parentWidget())
-        q->parentWidget()->d_func()->invalidateBuffer(q->geometry());
+        q->parentWidget()->d_func()->invalidateBuffer(effectiveRectFor(q->geometry()));
 
     WId old_fid = frameWinId();
@@ -1641 +1645 @@
 }
 
+#ifndef QT_NO_CURSOR
 void QWidget::grabMouse(const QCursor &cursor)
 {
@@ -1654 +1659 @@
     }
 }
+#endif
 
 void QWidget::releaseMouse()
@@ -1929 +1935 @@
  */
 
-void QWidgetPrivate::setWSGeometry(bool dontShow)
+void QWidgetPrivate::setWSGeometry(bool dontShow, const QRect &)
 {
     Q_Q(QWidget);