Changeset 8735 for trunk/src/user32/pmwindow.cpp

Timestamp:

Jun 20, 2002, 4:18:15 PM (23 years ago)

Author:

sandervl

Message:

drag & drop fix; added SetDragDrop; enabled drag & drop

File:

• trunk/src/user32/pmwindow.cpp (modified) (9 diffs)

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.178 2002-06-17 14:04:54 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.179 2002-06-20 14:18:15 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -67 +67 @@
 BOOL    fOS2Look = FALSE;
 BOOL    fForceMonoCursor = FALSE;
+BOOL    fDragDropActive = FALSE;
+BOOL    fDragDropDisabled = FALSE;
 HBITMAP hbmFrameMenu[3] = {0};
 
@@ -264 +266 @@
 {
     fForceMonoCursor = TRUE;
+}
+//******************************************************************************
+//******************************************************************************
+void WIN32API SetDragDrop(BOOL fDisabled)
+{
+    fDragDropDisabled = fDisabled;
 }
 //******************************************************************************
@@ -785 +793 @@
         break;
 
-//temporarily disabled
-#if 0
     case DM_DRAGOVER:
     {
@@ -796 +802 @@
         dprintf(("OS2: DM_DRAGOVER %x (%d,%d)", win32wnd->getWindowHandle(), sxDrop, syDrop));
 
+        if(fDragDropDisabled) {
+                rc = (MRFROM2SHORT (DOR_NEVERDROP, 0));
+            break;
+        }
+
         //does this window accept dropped files?
         if(!DragDropAccept(win32wnd->getWindowHandle())) {
@@ -810 +821 @@
             char *pszFiles;
 
-            win32wnd->setDragDropActive(TRUE);
-
             pszFiles = PMDragExtractFiles(pDragInfo, &cItems, &ulBytes);
             if(pszFiles) {
                 POINT point = {sxDrop, syDrop};
                 if(DragDropDragEnter(win32wnd->getWindowHandle(), point, cItems, pszFiles, ulBytes, DROPEFFECT_COPY_W) == FALSE) {
-                        rc = (MRFROM2SHORT (DOR_NEVERDROP, 0));
+                    rc = (MRFROM2SHORT (DOR_NEVERDROP, 0));
                 }
-                else    rc = (MRFROM2SHORT(DOR_DROP, DO_MOVE));
+                else {
+                    fDragDropActive = TRUE;
+                    rc = (MRFROM2SHORT(DOR_DROP, DO_MOVE));
+                    win32wnd->setDragDropActive(TRUE);
+                }
                 free(pszFiles);
             }
@@ -837 +850 @@
     {
         dprintf(("OS2: DM_DRAGLEAVE %x", win32wnd->getWindowHandle()));
+
+        if(fDragDropDisabled) {
+            break;
+        }
+
+        fDragDropActive = FALSE;
+
+        //does this window accept dropped files?
+        if(!DragDropAccept(win32wnd->getWindowHandle())) {
+            break;
+        }
+
         DragDropDragLeave(win32wnd->getWindowHandle());
         win32wnd->setDragDropActive(FALSE);
@@ -852 +877 @@
         dprintf(("OS2: DM_DROP %x (%d,%d)", win32wnd->getWindowHandle(), sxDrop, syDrop));
 
+        fDragDropActive = FALSE;
         rc = (MRFROM2SHORT (DOR_NODROP, 0));
+
+        if(fDragDropDisabled) {
+            rc = (MRFROM2SHORT (DOR_NODROP, 0));
+            break;
+        }
 
         //does this window accept dropped files?
@@ -879 +910 @@
         break;
     }
-#endif
 
     case WM_DDE_INITIATE: