Changeset 569 for trunk/src/gui/kernel/qwidget_pm.cpp

Timestamp:

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

Author:

Dmitry A. Kuminov

Message:

gui: Adopted to 4.6.1 changes.

File:

• trunk/src/gui/kernel/qwidget_pm.cpp (modified) (6 diffs)

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);