Changeset 1673 for trunk/dll/dircnrs.c
- Timestamp:
- Dec 30, 2012, 7:51:01 PM (13 years ago)
- File:
-
- 1 edited
-
trunk/dll/dircnrs.c (modified) (18 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/dll/dircnrs.c
r1664 r1673 225 225 break; 226 226 } 227 / * else intentional fallthru */227 // else intentional fallthru 228 228 case DIR_SELECTED: 229 229 case DIR_VIEW: … … 256 256 QW_PARENT), 257 257 DIR_CNR), QWL_USER); 258 if (id == DIR_SORT) { / * don't have sort pathname in dirs */258 if (id == DIR_SORT) { // don't have sort pathname in dirs 259 259 WinSendMsg(hwndButtonPopup, 260 260 MM_DELETEITEM, … … 514 514 if (AcceptOneDrop(hwnd, mp1, mp2)) 515 515 return MRFROM2SHORT(DOR_DROP, DO_MOVE); 516 return (MRFROM2SHORT(DOR_NODROP, 0)); / * Drop not valid */516 return (MRFROM2SHORT(DOR_NODROP, 0)); // Drop not valid 517 517 case DM_DROPHELP: 518 518 DropHelp(mp1, mp2, hwnd, GetPString(IDS_DIRCNRFOLDERDROPHELP)); … … 754 754 Fortify_ChangeScope(dcd, -1); 755 755 # endif 756 / * set unique id */756 // set unique id 757 757 WinSetWindowUShort(hwnd, QWS_ID, DIROBJ_FRAME + (DIR_FRAME - dcd->id)); 758 758 dcd->hwndObject = hwnd; 759 759 if (ParentIsDesktop(hwnd, dcd->hwndParent)) 760 DosSleep(100); //05 Aug 07 GKY 250760 DosSleep(100); 761 761 } 762 762 else … … 835 835 836 836 case UM_RESCAN: 837 /* 838 * populate container 839 */ 837 // populate container 840 838 dcd = WinQueryWindowPtr(hwnd, QWL_USER); 841 839 if (dcd) { 842 //DosEnterCritSec(); //GKY 11-29-08843 840 DosRequestMutexSem(hmtxFM2Globals, SEM_INDEFINITE_WAIT); 844 841 if (dcd->stopflag) … … 846 843 if (dcd->stopflag) { 847 844 DosReleaseMutexSem(hmtxFM2Globals); 848 //DosExitCritSec();849 845 return 0; 850 846 } 851 847 DosReleaseMutexSem(hmtxFM2Globals); 852 //DosExitCritSec();853 848 if (mp1) { 854 849 strcpy(dcd->previous, dcd->directory); … … 943 938 WinSendMsg(dcd->hwndCnr, CM_SETRECORDEMPHASIS, MPFROMP(pci), 944 939 MPFROM2SHORT(TRUE, CRA_CURSORED)); 945 / * make sure that record shows in viewport */940 // make sure that record shows in viewport 946 941 ShowCnrRecord(dcd->hwndCnr, (PMINIRECORDCORE) pci); 947 942 } … … 1362 1357 1363 1358 case WM_SETFOCUS: 1364 / * put name of our window (directory name) on status line */1359 // put name of our window (directory name) on status line 1365 1360 if (mp2) { 1366 1361 // Getting focus 1367 1362 if (dcd && hwndStatus) { 1368 / * put name of our window (directory name) on status line */1363 // put name of our window (directory name) on status line 1369 1364 PCNRITEM pci = NULL; 1370 1365 if (fAutoView && hwndMain) { … … 1550 1545 if (dcd) { 1551 1546 if (!dcd->hwndObject) { 1552 /* 1553 * first time through -- set things up 1554 */ 1547 // first time through -- set things up 1555 1548 1556 1549 CNRINFO cnri; … … 1881 1874 pci = FindCnrRecord(hwnd, newfile, NULL, TRUE, FALSE, TRUE); 1882 1875 if (pci && (INT) pci != -1) 1883 / * make sure that record shows in viewport */1876 // make sure that record shows in viewport 1884 1877 ShowCnrRecord(hwnd, (PMINIRECORDCORE) pci); 1885 1878 } … … 2840 2833 break; 2841 2834 2842 /*2843 case CN_PICKUP:2844 return PickUp(hwnd,dcd->hwndObject,mp2);2845 */2846 2847 2835 case CN_CONTEXTMENU: 2848 2836 { … … 2933 2921 if (mp2) { 2934 2922 2935 PDRAGITEM pDItem; / * Pointer to DRAGITEM */2936 PDRAGINFO pDInfo; / * Pointer to DRAGINFO */2923 PDRAGITEM pDItem; // Pointer to DRAGITEM 2924 PDRAGINFO pDInfo; // Pointer to DRAGINFO 2937 2925 PCNRITEM pci; 2938 2926 USHORT uso; … … 2949 2937 DRIVE_NOTWRITEABLE)) { 2950 2938 DrgFreeDraginfo(pDInfo); 2951 return MRFROM2SHORT(DOR_DROP, / * Return okay to link */2952 DO_LINK); / * (compare) only */2939 return MRFROM2SHORT(DOR_DROP, // Return okay to link 2940 DO_LINK); // (compare) only 2953 2941 } 2954 2942 if (pci) { … … 2986 2974 } 2987 2975 2988 /* Access DRAGITEM index to DRAGITEM 2976 /** 2977 * Access DRAGITEM index to DRAGITEM 2989 2978 * Check valid rendering mechanisms and data 2990 2979 */ … … 2999 2988 if (toupper(*dcd->directory) < 'C') 3000 2989 return MRFROM2SHORT(DOR_DROP, DO_COPY); 3001 return MRFROM2SHORT(DOR_DROP, / * Return okay to drop */2990 return MRFROM2SHORT(DOR_DROP, // Return okay to drop 3002 2991 ((fCopyDefault) ? DO_COPY : DO_MOVE)); 3003 2992 } 3004 DrgFreeDraginfo(pDInfo); / * Free DRAGINFO */3005 } 3006 return MRFROM2SHORT(DOR_NODROP, 0); / * Drop not valid */2993 DrgFreeDraginfo(pDInfo); // Free DRAGINFO 2994 } 2995 return MRFROM2SHORT(DOR_NODROP, 0); // Drop not valid 3007 2996 3008 2997 case CN_INITDRAG: … … 3634 3623 MPFROMLONG(CMA_FIRST)); 3635 3624 if (pci && (INT) pci != -1) { 3636 / * Got match make found item current item */3625 // Got match make found item current item 3637 3626 USHORT attrib = CRA_CURSORED; 3638 3627 // 29 Mar 09 SHL fixme to clear other object select if not extended select … … 3641 3630 WinSendMsg(hwnd, CM_SETRECORDEMPHASIS, MPFROMP(pci), 3642 3631 MPFROM2SHORT(TRUE, attrib)); 3643 / * make sure that record shows in viewport */3632 // make sure that record shows in viewport 3644 3633 ShowCnrRecord(hwnd, (PMINIRECORDCORE) pci); 3645 3634 return (MRESULT)TRUE; … … 3675 3664 ULONG flags) 3676 3665 { 3677 /* bitmapped flags: 3666 /** 3667 * bitmapped flags: 3678 3668 * 0x00000001 = don't close app when window closes 3679 3669 * 0x00000002 = no frame controls
Note:
See TracChangeset
for help on using the changeset viewer.
