Changeset 769 for trunk/src/gui/kernel/qwidget.cpp

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/kernel/qwidget.cpp (modified) (14 diffs)

trunk/src/gui/kernel/qwidget.cpp

@@ -123 +123 @@
 #include "private/qgesturemanager_p.h"
 
+
+
+
+
 // widget/widget data creation count
 //#define QWIDGET_EXTRA_DEBUG
@@ -197 +201 @@
       , isScrolled(0)
       , isMoved(0)
+
       , usesDoubleBufferedGLContext(0)
 #if defined(Q_WS_X11)
@@ -207 +212 @@
 #elif defined(Q_WS_MAC)
       , needWindowChange(0)
-      , isGLWidget(0)
       , window_event(0)
       , qd_hd(0)
@@ -1446 +1450 @@
 #endif
 
+
     if (d->extra && d->extra->topextra && d->extra->topextra->backingStore) {
         // Okay, we are about to destroy the top-level window that owns
@@ -1455 +1460 @@
         delete d->extra->topextra->backingStore;
         d->extra->topextra->backingStore = 0;
-    } else if (QWidgetBackingStore *bs = d->maybeBackingStore()) {
+    }
+#endif
+    if (QWidgetBackingStore *bs = d->maybeBackingStore()) {
         bs->removeDirtyWidget(this);
         if (testAttribute(Qt::WA_StaticContents))
@@ -1487 +1494 @@
         QWidgetPrivate::allWidgets->remove(this);
 
-    QEvent e(QEvent::Destroy);
-    QCoreApplication::sendEvent(this, &e);
+    QT_TRY {
+        QEvent e(QEvent::Destroy);
+        QCoreApplication::sendEvent(this, &e);
+    } QT_CATCH(const std::exception&) {
+        // if this fails we can't do anything about it but at least we are not allowed to throw.
+    }
 }
 
@@ -1676 +1687 @@
         dirty = QRegion();
     } else if (QWidgetBackingStore *bs = maybeBackingStore()) {
+
+
+
+
+
         bs->sync();
+
     }
 }
@@ -1684 +1701 @@
     if (paintOnScreen())
         repaint_sys(region);
-    else if (QWidgetBackingStore *bs = maybeBackingStore())
+    else if (QWidgetBackingStore *bs = maybeBackingStore()) {
+#ifdef QT_MAC_USE_COCOA
+        Q_UNUSED(bs);
+        void qt_mac_set_needs_display(QWidget *, QRegion);
+        qt_mac_set_needs_display(q_func(), region);
+#else
         bs->sync(q_func(), region);
+
+
 }
 
@@ -3368 +3392 @@
     appear on screen. This also applies to windows.
 
-    \sa pos, geometry, minimumSize, maximumSize, resizeEvent()
+    \sa pos, geometry, minimumSize, maximumSize, resizeEvent()
 */
 
@@ -6110 +6134 @@
             if (previousProxyFocus && previousProxyFocus->focusProxy())
                 previousProxyFocus = previousProxyFocus->focusProxy();
+
+
         }
     }
@@ -7522 +7548 @@
         if (!widget || widget->isWindow() || widget->testAttribute(Qt::WA_WState_Hidden))
             continue;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         if (spontaneous)
             widget->setAttribute(Qt::WA_Mapped, false);
@@ -7916 +7959 @@
     if(w && w->isWindow() && w->isVisible() && w->isEnabled()) {
         LONG dwStyle = GetWindowLong(w->winId(), GWL_STYLE);
+
         if (setStyle)
-            dwStyle |= WS_DISABLED;
+            wStyle |= WS_DISABLED;
         else
-            dwStyle &= ~WS_DISABLED;
-        SetWindowLong(w->winId(), GWL_STYLE, dwStyle);
-        // we might need to repaint in some situations (eg. menu)
-        w->repaint();
+            newStyle &= ~WS_DISABLED;
+        if (newStyle != dwStyle) {
+            SetWindowLong(w->winId(), GWL_STYLE, newStyle);
+            // we might need to repaint in some situations (eg. menu)
+            w->repaint();
+        }
     }
 }
@@ -8262 +8308 @@
 
 #ifdef QT_SOFTKEYS_ENABLED
-        if (isWindow() && isActiveWindow())
+        if (isWindow())
             QSoftKeyManager::updateSoftKeys();
 #endif
@@ -11731 +11777 @@
     return targetWidget;
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 #endif