Changeset 971 for trunk/dll/notebook.c

Timestamp:

Feb 23, 2008, 1:56:38 AM (17 years ago)

Author:

John Small

Message:

Ticket 230: Fix/improve code related to various state or presparam values
stored in the INI file.

File:

• trunk/dll/notebook.c (modified) (6 diffs)

trunk/dll/notebook.c

@@ -1397 +1397 @@
           // Save state and restore to refresh windows with new settings
           if (SaveDirCnrState(hwndMain, GetPString(IDS_FM2TEMPTEXT)) > 0) {
-            PostMsg(MainObjectHwnd, UM_RESTORE, MPVOID, MPFROMLONG(2));
-            PostMsg(hwndMain, UM_RESTORE, MPVOID, MPVOID);
+            PostMsg(MainObjectHwnd, UM_RESTORE, MPVOID, MPFROMLONG(2));
+//          PostMsg(hwndMain, UM_RESTORE, MPVOID, MPVOID);
+            PostMsg(MainObjectHwnd, UM_RESTORE, GetPString(IDS_FM2TEMPTEXT), MPVOID);
           }
         }
@@ -1821 +1822 @@
         PrfWriteProfileData(fmprof,
                             appname, "SubjectDisplayWidth",
-                            &SubjectDisplayWidth, sizeof(ULONG));
-        PrfWriteProfileData(fmprof,
-                            appname, "DirCnr.SubjectDisplayWidth",
                             &SubjectDisplayWidth, sizeof(ULONG));
     }
@@ -2366 +2364 @@
                             "CollectorflWindowAttr",
                             &flWindowAttr, sizeof(ULONG));
-        PrfWriteProfileData(fmprof, appname, "DirCnr.Fontnamesize", NULL, 0);
         PrfWriteProfileData(fmprof,
                             appname, "Collector.Fontnamesize", NULL, 0);
@@ -2421 +2418 @@
                             "CollectorflWindowAttr",
                             &flWindowAttr, sizeof(ULONG));
-        PrfWriteProfileData(fmprof,
-                            appname,
-                            "DirCnr.Fontnamesize",
-                            GetPString(IDS_8HELVTEXT),
-                            strlen(GetPString(IDS_8HELVTEXT)) + 1);
         PrfWriteProfileData(fmprof,
                             appname,
@@ -2484 +2476 @@
         PrfWriteProfileData(fmprof, appname, "CollectorflWindowAttr",
                             &flWindowAttr, sizeof(ULONG));
-        PrfWriteProfileData(fmprof, appname, "DirCnr.Fontnamesize",
-                            GetPString(IDS_8HELVTEXT),
-                            strlen(GetPString(IDS_8HELVTEXT)) + 1);
         PrfWriteProfileData(fmprof, appname, "Collector.Fontnamesize",
                             GetPString(IDS_8HELVTEXT),
@@ -2950 +2939 @@
       if (SaveDirCnrState(hwndMain, GetPString(IDS_FM2TEMPTEXT)) > 0) {
         // Tell window procedure to close container windows
-        PostMsg(MainObjectHwnd, UM_RESTORE, MPVOID, MPFROMLONG(2));
+        PostMsg(MainObjectHwnd, UM_RESTORE, MPVOID, MPFROMLONG(2));
         // Restore saved state
-        PostMsg(hwndMain, UM_RESTORE, MPVOID, MPVOID);
+//      PostMsg(hwndMain, UM_RESTORE, MPVOID, MPVOID);
+        PostMsg(MainObjectHwnd, UM_RESTORE, GetPString(IDS_FM2TEMPTEXT), MPVOID);
       }
     }