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

Timestamp:

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

Author:

Dmitry A. Kuminov

Message:

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

File:

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

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -64 +64 @@
 #include "qkeymapper_p.h"
 #include "qcursor_p.h"
+
 
 #define WM_KBDLAYERCHANGED   0x0BD4 // defined in OS2TK45/h/pmbidi.h
@@ -702 +703 @@
 #define SV_WORKAREA_XLEFT   54
 
-#ifndef QT_NO_DRAGANDDROP
-extern MRESULT qt_dispatchDragAndDrop(QWidget *, const QMSG &); // qdnd_pm.cpp
-#endif
-
 /*!
     \internal
@@ -921 +918 @@
 #ifndef QT_NO_DRAGANDDROP
         } else if (msg >= WM_DRAGFIRST && msg <= WM_DRAGLAST) {
-            return qt_dispatchDragAndDrop(widget, qmsg);
+            return dispatchDragAndDrop(widget, qmsg);
 #endif
         } else {
@@ -2142 +2139 @@
     if (rc == RGN_ERROR) { // The update bounding rect is invalid
         GpiDestroyRegion(displayPS, hrgn);
-        d_func()->hd = NULLHANDLE;
         setAttribute(Qt::WA_PendingUpdate, false);
         return false;
@@ -2166 +2162 @@
     if (rcl.xRight <= rcl.xLeft || rcl.yTop <= rcl.yBottom) {
         WinEndPaint(d_func()->hd);
+
         GpiDestroyRegion(displayPS, hrgn);
-        d_func()->hd = NULLHANDLE;
         setAttribute(Qt::WA_PendingUpdate, false);
         return true;
@@ -2173 +2169 @@
 
     // flip y coordinate
-    rcl.yBottom = height() - (rcl.yBottom + 1);
-    rcl.yTop = height() - (rcl.yTop + 1);
-
     // note: right top point is exlusive in rcl
-    QRect updRect(QPoint(rcl.xLeft, rcl.yTop + 1),
-                  QPoint(rcl.xRight - 1, rcl.yBottom));
+    QRect updRect(QPoint(rcl.xLeft, ),
+                  QPoint(rcl.xRight - 1, ));
 
     // Mapping region from system to qt (32 bit) coordinate system.