Changeset 864

Timestamp:

Nov 11, 2007, 9:25:05 PM (18 years ago)

Author:

Gregg Young

Message:

Cancel in walk directory dialog now directly closes dialog even if directory path text has changed (Ticket 85)

File:

• trunk/dll/walkem.c (modified) (5 diffs)

trunk/dll/walkem.c

@@ -22 +22 @@
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
   25 Aug 07 SHL Correct #pragma alloc_text typos
+  11 Nov 07 GKY Cancel now directly closes dialog even if directory path text has changed
 
 ***********************************************************************/
@@ -1080 +1081 @@
       szBuff[strlen(szBuff) - 1] = 0;
     MakeFullName(szBuff);
-    if (*szBuff && stricmp(szBuff, wa->szCurrentPath)) {
+    if (*szBuff && stricmp(szBuff, wa->szCurrentPath) && SHORT1FROMMP(mp1) != DID_CANCEL) {
       if (!SetDir(WinQueryWindow(WinQueryWindow(hwnd, QW_PARENT),
                                  QW_OWNER), hwnd, szBuff, 0))
         strcpy(wa->szCurrentPath, szBuff);
-      else if (SHORT1FROMMP(mp1) != DID_CANCEL)
+      else //if (SHORT1FROMMP(mp1) != DID_CANCEL)
         return 0;
     }
@@ -1157 +1158 @@
     case DID_CANCEL:
       if (wa->changed)
-        WinSendMsg(hwnd, UM_SETUP3, MPVOID, MPVOID);
+        WinSendMsg(hwnd, UM_SETUP3, MPVOID, MPVOID);
       free(wa);
       WinDismissDlg(hwnd, 0);
@@ -1502 +1503 @@
       szBuff[strlen(szBuff) - 1] = 0;
     MakeFullName(szBuff);
-    if (*szBuff && stricmp(szBuff, wa->szCurrentPath1)) {
+    if (*szBuff && stricmp(szBuff, wa->szCurrentPath1) && SHORT1FROMMP(mp1) != DID_CANCEL) {
       if (!SetDir(WinQueryWindow(WinQueryWindow(hwnd, QW_PARENT),
                                  QW_OWNER), hwnd, szBuff, 0))
         strcpy(wa->szCurrentPath1, szBuff);
-      else if (SHORT1FROMMP(mp1) != DID_CANCEL)
+      else //if (SHORT1FROMMP(mp1) != DID_CANCEL)
         return 0;
     }
@@ -1518 +1519 @@
       szBuff[strlen(szBuff) - 1] = 0;
     MakeFullName(szBuff);
-    if (*szBuff && stricmp(szBuff, wa->szCurrentPath2)) {
+    if (*szBuff && stricmp(szBuff, wa->szCurrentPath2) && SHORT1FROMMP(mp1) != DID_CANCEL) {
       if (!SetDir(WinQueryWindow(WinQueryWindow(hwnd, QW_PARENT),
                                  QW_OWNER), hwnd, szBuff, 0))
         strcpy(wa->szCurrentPath2, szBuff);
-      else if (SHORT1FROMMP(mp1) != DID_CANCEL)
+      else // if (SHORT1FROMMP(mp1) != DID_CANCEL)
         return 0;
     }