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

Timestamp:

Jan 12, 2010, 12:00:10 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: DnD: Implemented support for painting in widgets during drag and draw.

File:

• trunk/src/gui/kernel/qwidget.cpp (modified) (3 diffs)

trunk/src/gui/kernel/qwidget.cpp

@@ -86 +86 @@
 #if defined (Q_WS_WIN)
 # include <private/qwininputcontext_p.h>
+#endif
+
+#if defined (Q_WS_PM)
+# include "qdnd_p.h"
 #endif
 
@@ -10411 +10415 @@
     if (d->hd != NULLHANDLE)
         return (HPS) d->hd;
+#ifndef QT_NO_DRAGANDDROP
+    if (QDragManager::self()->isInDrag())
+        return DrgGetPS(winId());
+#endif
     return WinGetPS(winId());
 }
@@ -10424 +10432 @@
     // If there is a widget's own ps, the release operation is ignored because
     // it will be released elsewhere. Otherwise, we assume that the given hps
-    // was acquired by WinGetPS in the getPS() call and release it.
-    if (d->hd == NULLHANDLE)
+    // was acquired by DrgGetPS/WinGetPS in the getPS() call and release it.
+    if (d->hd == NULLHANDLE) {
+#ifndef QT_NO_DRAGANDDROP
+        if (QDragManager::self()->isInDrag())
+            DrgReleasePS(hps);
+        else
+#endif
         WinReleasePS(hps);
+    }
 }
 #else