Changeset 1471 for trunk/dll/mainwnd.c

Timestamp:

Oct 14, 2009, 1:43:04 AM (16 years ago)

Author:

Steven Levine

Message:

Remember last filter mask selection
Use Ctrl-click to select state or commonly used directory quicklist entry without activating.
Use Ctrl-click to select walk dialog user list entry without activating.
Avoid drivebar MB2 exception
Remember last seek and scan mask selection across runs
Avoid traps when changing tree container display style
Restore missing drives to drive list dropdown
Minor documentation updates

File:

• trunk/dll/mainwnd.c (modified) (7 diffs)

trunk/dll/mainwnd.c

@@ -2056 +2056 @@
         BOOL rdy, local;
         CHAR chDrv = *szDrv;
-        UINT iDrv;
+        UINT iDrv = chDrv - 'A';
 
         strcat(szDrv, PCSZ_BACKSLASH);
@@ -4101 +4101 @@
           if (fUserComboBox) {
             if (!aheight) {
-
               SWP swpTemp;
-
               WinQueryWindowPos(WinWindowFromID(hwndDrivelist, CBID_EDIT),
                                 &swpTemp);
@@ -4318 +4316 @@
       if (fUserComboBox) {
         if (!aheight) {
-
           SWP swpTemp;
-
           WinQueryWindowPos(WinWindowFromID(hwndDrivelist, CBID_EDIT),
                             &swpTemp);
@@ -6281 +6277 @@
           if (*path) {
             if (SHORT1FROMMP(mp1) == MAIN_USERLIST) {
+              // 06 Oct 09 SHL Ctrl-select selects, but suppresses open
+                if ((shiftstate & (KC_CTRL | KC_SHIFT | KC_ALT)) == KC_CTRL)
+                  break;
               if (!strcmp(path, GetPString(IDS_NEWDIRECTORYTEXT))) {
                 if (!LastDir ||
@@ -6323 +6322 @@
             else if (SHORT1FROMMP(mp1) == MAIN_SETUPLIST) {
               CHAR szKey[80];
-              ULONG size, numsaves = 0;
-
-              SetShiftState();
-              size = sizeof(ULONG);
+              ULONG numsaves = 0;
+              ULONG size = sizeof(ULONG);
+              // 06 Oct 09 SHL Ctrl-select selects, but suppresses open
+                if ((shiftstate & (KC_CTRL | KC_SHIFT | KC_ALT)) == KC_CTRL)
+                  break;
               sprintf(szKey, "%s.NumDirsLastTime", path);       // path is state name
               if (!PrfQueryProfileData(fmprof,
@@ -6369 +6369 @@
             else if (SHORT1FROMMP(mp1) == MAIN_CMDLIST) {
 
-              SHORT sSelect;
-
-              sSelect = (SHORT) WinSendMsg(hwndCmdlist,
-                                           LM_QUERYSELECTION,
-                                           MPFROMSHORT(LIT_FIRST), MPVOID);
+              SHORT sSelect = (SHORT) WinSendMsg(hwndCmdlist,
+                                                 LM_QUERYSELECTION,
+                                                 MPFROMSHORT(LIT_FIRST), MPVOID);
               if (sSelect >= 0)
                 WinPostMsg(hwnd,
@@ -6382 +6380 @@
             }
           }
-        }
+        } // CBN_ENTER
         break;