Changeset 672 for trunk/dll/arccnrs.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/arccnrs.c (modified) (9 diffs)

trunk/dll/arccnrs.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2006 Steven H. Levine
+  Copyright (c) 2001, 2007 Steven H. Levine
 
   11 Jun 02 SHL Ensure archive name not garbage
@@ -37 +37 @@
   20 Apr 07 SHL Sync with NumItemsToUnhilite mods
   21 Apr 07 GKY Find FM2Utils by path or utils directory
+  12 May 07 SHL Use dcd->ulItemsToUnHilite; sync with UnHilite arg mods
 
 ***********************************************************************/
@@ -1118 +1119 @@
 {
   DIRCNRDATA *dcd;
+  DIRCNRDATA *dcdsrc;
   PSZ psz;
 
@@ -1133 +1135 @@
       li = DoFileDrop(dcd->hwndCnr,
                       dcd->directory, FALSE, MPVOID, MPFROMP(&cni));
-      if (NumItemsToUnhilite)
-             saymsg(MB_CANCEL | MB_ICONEXCLAMATION,
-                                   hwnd,
-                                   GetPString(IDS_ERRORTEXT),
-                         GetPString(IDS_EXCEEDPMDRGLMT));
+      dcdsrc = INSTDATA(cni.pDragInfo->hwndSource);
+      if (dcdsrc->ulItemsToUnHilite) {
+        saymsg(MB_CANCEL | MB_ICONEXCLAMATION,
+               hwnd,
+               GetPString(IDS_ERRORTEXT),
+               GetPString(IDS_EXCEEDPMDRGLMT));
+      }
+
       if (li) {
         li->type = (msg == DM_DISCARDOBJECT) ? IDM_DELETE : IDM_PRINT;
@@ -1936 +1941 @@
                                       MPARAM mp2)
 {
-  DIRCNRDATA *dcd = WinQueryWindowPtr(hwnd, QWL_USER);
+  DIRCNRDATA *dcd = INSTDATA(hwnd);
+  DIRCNRDATA *dcdsrc;
 
   switch (msg) {
@@ -2374 +2380 @@
       DefaultViewKeys(hwnd, dcd->hwndFrame, dcd->hwndParent, &swp, filename);
       if (fUnHilite)
-        UnHilite(hwnd, FALSE, &dcd->lastselection);
+        UnHilite(hwnd, FALSE, &dcd->lastselection, 0);
     }
     return 0;
@@ -2895 +2901 @@
               }
               else if (fUnHilite && SHORT1FROMMP(mp1) != IDM_EDIT)
-                UnHilite(hwnd, TRUE, &dcd->lastselection);
+                UnHilite(hwnd, TRUE, &dcd->lastselection, 0);
             }
             else
@@ -3007 +3013 @@
                              dcd->hwndObject,
                              mp2, dcd->arcname, NULL, TRUE)) {
-                if ((fUnHilite && wasemphasized) || NumItemsToUnhilite)
-                  UnHilite(hwnd, TRUE, &dcd->lastselection);
+                if ((fUnHilite && wasemphasized) || dcd->ulItemsToUnHilite)
+                  UnHilite(hwnd, TRUE, &dcd->lastselection, dcd->ulItemsToUnHilite);
               }
               if (!ParentIsDesktop(hwnd, dcd->hwndParent) &&
@@ -3037 +3043 @@
           li = DoFileDrop(hwnd, dcd->arcname, FALSE, mp1, mp2);
           DosBeep(50, 100);             // fixme to know why beep?
-          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) {
             li->type = li->type == DO_MOVE ? IDM_ARCHIVEM : IDM_ARCHIVE;