Changeset 672 for trunk/dll/treecnr.c

Timestamp:

May 13, 2007, 7:57:48 AM (18 years ago)

Author:

Steven Levine

Message:

Use dcd->ulItemsToUnHilite
Sync UnHilite calls with arg mods

File:

• trunk/dll/treecnr.c (modified) (6 diffs)

trunk/dll/treecnr.c

@@ -30 +30 @@
   19 Apr 07 SHL Sync with AcceptOneDrop GetOneDrop mods
   19 Apr 07 SHL Add more drag/drop error checking
+  12 May 07 SHL Use dcd->ulItemsToUnHilite; sync with UnHilite arg mods
 
 ***********************************************************************/
@@ -504 +505 @@
 {
   DIRCNRDATA *dcd;
+  DIRCNRDATA *dcdsrc;
 
   switch (msg) {
@@ -547 +549 @@
       li = DoFileDrop(dcd->hwndCnr,
                       dcd->directory, FALSE, MPVOID, MPFROMP(&cni));
-      if (NumItemsToUnhilite)
+      dcdsrc = INSTDATA(cni.pDragInfo->hwndSource);
+      if (dcdsrc->ulItemsToUnHilite) {
         saymsg(MB_CANCEL | MB_ICONEXCLAMATION,
-                             hwnd,
-                             GetPString(IDS_ERRORTEXT),
-                   GetPString(IDS_EXCEEDPMDRGLMT));
+               hwnd,
+               GetPString(IDS_ERRORTEXT),
+               GetPString(IDS_EXCEEDPMDRGLMT));
+      }
       if (li) {
         li->type = ((fDefaultDeletePerm) ? IDM_PERMDELETE : IDM_DELETE);
@@ -830 +834 @@
 {
   static APPNOTIFY *apphead = NULL, *apptail = NULL;
-  DIRCNRDATA *dcd = WinQueryWindowPtr(hwnd, QWL_USER);
+  DIRCNRDATA *dcd = INSTDATA(hwnd);
+  DIRCNRDATA *dcdsrc;
 
   switch (msg) {
@@ -1378 +1383 @@
 
           li = DoFileDrop(hwnd, NULL, TRUE, mp1, mp2);
-          if (NumItemsToUnhilite)
+          dcdsrc = INSTDATA(((PCNRDRAGINFO)mp2)->pDragInfo->hwndSource);
+          if (dcdsrc->ulItemsToUnHilite) {
             saymsg(MB_CANCEL | MB_ICONEXCLAMATION,
-                                 hwnd,
-                                 GetPString(IDS_ERRORTEXT),
-                       GetPString(IDS_EXCEEDPMDRGLMT));
+                   hwnd,
+                   GetPString(IDS_ERRORTEXT),
+                   GetPString(IDS_EXCEEDPMDRGLMT));
+          }
           if (li) {
             if (!*li->targetpath) {
@@ -2784 +2791 @@
             RunCommand(hwnd, x);
             if (fUnHilite)
-              UnHilite(hwnd, TRUE, &dcd->lastselection);
+              UnHilite(hwnd, TRUE, &dcd->lastselection, 0);
           }
         }