Changeset 1031 for trunk/dll/mainwnd.c

Timestamp:

Jun 28, 2008, 10:54:10 PM (17 years ago)

Author:

John Small

Message:

Ticket 227: Moved warning message string to fm2dll.str.

File:

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

trunk/dll/mainwnd.c

@@ -2974 +2974 @@
   CHAR szDir[CCHMAXPATH];
   CHAR szPrefix[STATE_NAME_MAX_BYTES + 2];
-  HWND hwndDir, hwndC, hwndPPSave = NULLHANDLE;
+  HWND hwndDir, hwndC, hwndDir0 = NULLHANDLE, hwndPPSave = NULLHANDLE;
   SWP swp, swpO, swpN;
   ULONG size, numsaves = 0, x;
@@ -3232 +3232 @@
                                       MPFROMP(szDir), MPFROMLONG(1));
           if (hwndDir) {
+
+            if (x == 0) {
+              hwndDir0 = hwndDir;
+            }
             hwndC = WinWindowFromID(hwndDir, FID_CLIENT);
             if (hwndC) {
@@ -3334 +3338 @@
                               swp.cy,
                               swp.fl | SWP_MOVE |
-                              SWP_SIZE | SWP_SHOW | SWP_ZORDER |
+                              SWP_SIZE | SWP_SHOW |  SWP_ZORDER |
                               SWP_ACTIVATE);
             else if (swp.fl & (SWP_HIDE | SWP_MINIMIZE)) {
@@ -3355 +3359 @@
        SavePresParams(hwndPPSave, "DirCnr");
        WinDestroyWindow(hwndPPSave);
+    }
+    if (hwndDir0) {
+      WinSetFocus(HWND_DESKTOP, hwndDir0);
     }
   }
@@ -4607 +4614 @@
           if (saymsg(MB_YESNO | MB_DEFBUTTON2 | MB_ICONASTERISK, hwnd,
               GetPString(IDS_WARNINGTEXT),
-              "\"%s\" is the state name used by \"Save directory container state\". Any changes to this state will last only until FM/2 closes or this setting is disabled. Proceed with this change?", szStateName) == MBID_NO)
+              GetPString(IDS_SHUTDOWNSTATE_WARNING), szStateName) == MBID_NO)
               fAbortOperation = TRUE;
         }