Changeset 438 for trunk/src/gui

Timestamp:

Dec 24, 2009, 3:29:44 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: First DnD bits.

Location:

trunk/src/gui/kernel

Files:

• qapplication_pm.cpp (modified) (1 diff)
• qdnd.cpp (modified) (4 diffs)
• qdnd_p.h (modified) (2 diffs)
• qdnd_pm.cpp (modified) (1 diff)

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -701 +701 @@
 #define SV_WORKAREA_XRIGHT  53
 #define SV_WORKAREA_XLEFT   54
+
+
+
+
 
 /*!

trunk/src/gui/kernel/qdnd.cpp

@@ -100 +100 @@
 "........aa."};
 
-#ifdef Q_WS_WIN
+#if
 /* XPM */
 static const char * const ignore_xpm[] = {
 "24 30 3 1",
 ".        c None",
+
 "a        c #000000",
-"X        c #FFFFFF",
+"X        c #FFFFFF", // Windows cursor is traditionally white
+#else
+"a        c #FFFFFF",
+"X        c #000000", // OS/2 cursor is traditionally black
+#endif
 "aa......................",
 "aXa.....................",
@@ -327 +332 @@
     Q_ASSERT(!instance);
 
-#ifdef Q_WS_WIN
+#if
     n_cursor = 4;
 #else
@@ -340 +345 @@
     pm_cursor[1] = QPixmap((const char **)copy_xpm);
     pm_cursor[2] = QPixmap((const char **)link_xpm);
-#ifdef Q_WS_WIN
+#if
     pm_cursor[3] = QPixmap((const char **)ignore_xpm);
 #endif
@@ -487 +492 @@
     : QInternalMimeData()
 {
+
+
+
 }
 

trunk/src/gui/kernel/qdnd_p.h

@@ -185 +185 @@
 };
 
+
+
+
+
 class QDropData : public QInternalMimeData
 {
@@ -200 +204 @@
 public:
     LPDATAOBJECT currentDataObject;
+
+
+
 #endif
 };

trunk/src/gui/kernel/qdnd_pm.cpp

@@ -51 +51 @@
 #include "qdatastream.h"
 #include "qcursor.h"
-#include "qt_os2.h"
+#include "q.h"
 #include "qdnd_p.h"
 #include "qdebug.h"
 
+
+
 QT_BEGIN_NAMESPACE
 
 #if !defined(QT_NO_DRAGANDDROP) && !defined(QT_NO_CLIPBOARD)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+