Changeset 1400 for trunk/dll/collect.c

Timestamp:

Mar 8, 2009, 6:50:25 PM (16 years ago)

Author:

Gregg Young

Message:

Remainder of changes to rename commafmt.h/c (Ticket 28, 82); Additional strings moved to PCSZs in init.c (Ticket 6); Added WriteDetailsSwitches used it and LoadDetailsSwitches to consolidate inline code (Ticket 343, 344)

File:

• trunk/dll/collect.c (modified) (8 diffs)

trunk/dll/collect.c

@@ -63 +63 @@
   07 Feb 09 GKY Add *DateFormat functions to format dates based on locale
   07 Feb 09 GKY Move repeated strings to PCSZs.
+  08 Mar 09 GKY Renamed commafmt.h i18nutil.h
+  08 Mar 09 GKY Additional strings move to PCSZs in init.c
 
 ***********************************************************************/
@@ -130 +132 @@
 #include "newview.h"                    // StartViewer
 #include "undel.h"                      // UndeleteDlgProc
-#include "commafmt.h"                   // commafmt
+#include "i18nutil.h"                   // commafmt
 #include "getnames.h"                   // insert_filename
 #include "select.h"                     // InvertAll
@@ -1204 +1206 @@
 
   case WM_PRESPARAMCHANGED:
-    PresParamChanged(hwnd, "Collector", mp1, mp2);
+    PresParamChanged(hwnd, PCSZ_COLLECTOR, mp1, mp2);
     break;
 
@@ -1415 +1417 @@
         CNRINFO cnri;
 
-        RestorePresParams(hwnd, "Collector");
-        LoadDetailsSwitches("Collector", &dcd->ds);
+        RestorePresParams(hwnd, PCSZ_COLLECTOR);
+        LoadDetailsSwitches(PCSZ_COLLECTOR, &dcd->ds);
 
         dcd->amextracted = FALSE;       // Say not busy
@@ -1580 +1582 @@
       else {
         if (!PostMsg(dcd->hwndObject, UM_COLLECTFROMFILE, mp1, mp2)) {
-          Runtime_Error(pszSrcFile, __LINE__, "PostMsg");
+          Runtime_Error(pszSrcFile, __LINE__, PCSZ_POSTMSG);
         }
       }
@@ -1595 +1597 @@
       if (dcd) {
         if (!PostMsg(dcd->hwndObject, UM_COMMAND, mp1, mp2)) {
-          Runtime_Error(pszSrcFile, __LINE__, "PostMsg");
+          Runtime_Error(pszSrcFile, __LINE__, PCSZ_POSTMSG);
           FreeListInfo((LISTINFO *) mp1);
         }
@@ -2082 +2084 @@
         AdjustDetailsSwitches(hwnd, dcd->hwndLastMenu,
                               SHORT1FROMMP(mp1), NULL,
-                              "Collector", &dcd->ds, FALSE);
+                              PCSZ_COLLECTOR, &dcd->ds, FALSE);
         break;
 
@@ -2262 +2264 @@
                 *li->targetpath = 0;
               if (!PostMsg(dcd->hwndObject, action, MPFROMP(li), MPVOID)) {
-                Runtime_Error(pszSrcFile, __LINE__, "PostMsg");
+                Runtime_Error(pszSrcFile, __LINE__, PCSZ_POSTMSG);
                 FreeListInfo(li);
               }