Changeset 872 for trunk/dll/collect.c

Timestamp:

Nov 23, 2007, 12:11:21 AM (18 years ago)

Author:

Gregg Young

Message:

Fix failure of font changes and font colors on main menus (tickets 27 & 162)

File:

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

trunk/dll/collect.c

@@ -41 +41 @@
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
   26 Aug 07 GKY DosSleep(1) in loops changed to (0)
-
+  22 Nov 07 GKY Use CopyPresParams to fix presparam inconsistencies in menus
 
 ***********************************************************************/
@@ -127 +127 @@
               if (dcd) {
                 SetViewMenu(hwndButtonPopup, dcd->flWindowAttr);
-                SetDetailsSwitches(hwndButtonPopup, dcd);
+                SetDetailsSwitches(hwndButtonPopup, dcd);
+                CopyPresParams(hwndButtonPopup, hwnd);
               }
 
@@ -354 +355 @@
 
   case UM_VIEWSMENU:
-    return MRFROMLONG(CheckMenu(&CollectorCnrMenu, COLLECTORCNR_POPUP));
+    return MRFROMLONG(CheckMenu(hwnd, &CollectorCnrMenu, COLLECTORCNR_POPUP));
 
   case MM_PORTHOLEINIT:
@@ -1358 +1359 @@
         SetViewMenu((HWND) mp2, dcd->flWindowAttr);
         WinEnableMenuItem((HWND) mp2, IDM_RESELECT,
-                          (dcd->lastselection != NULL));
+                          (dcd->lastselection != NULL));
+        CopyPresParams((HWND) mp2, hwnd);
         break;
 
@@ -1460 +1462 @@
       case IDM_SHOWSELECT:
         QuickPopup(hwnd, dcd,
-                   CheckMenu(&CollectorCnrMenu, COLLECTORCNR_POPUP),
+                   CheckMenu(hwnd, &CollectorCnrMenu, COLLECTORCNR_POPUP),
                    IDM_SELECTSUBMENU);
         break;
@@ -1466 +1468 @@
       case IDM_SHOWSORT:
         QuickPopup(hwnd, dcd,
-                   CheckMenu(&CollectorCnrMenu, COLLECTORCNR_POPUP),
+                   CheckMenu(hwnd, &CollectorCnrMenu, COLLECTORCNR_POPUP),
                    IDM_SORTSUBMENU);
         break;
@@ -2052 +2054 @@
       if (pci && (INT) pci != -1) {
         if (pci->attrFile & FILE_DIRECTORY)
-          menuHwnd = CheckMenu(&CollectorDirMenu, COLLECTORDIR_POPUP);
+          menuHwnd = CheckMenu(hwnd, &CollectorDirMenu, COLLECTORDIR_POPUP);
         else
-          menuHwnd = CheckMenu(&CollectorFileMenu, COLLECTORFILE_POPUP);
+          menuHwnd = CheckMenu(hwnd, &CollectorFileMenu, COLLECTORFILE_POPUP);
       }
       return MRFROMLONG(menuHwnd);
@@ -2072 +2074 @@
             MarkAll(hwnd, FALSE, FALSE, TRUE);
             if (pci->attrFile & FILE_DIRECTORY)
-              dcd->hwndLastMenu = CheckMenu(&CollectorDirMenu,
+              dcd->hwndLastMenu = CheckMenu(hwnd, &CollectorDirMenu,
                                             COLLECTORDIR_POPUP);
             else
-              dcd->hwndLastMenu = CheckMenu(&CollectorFileMenu,
+              dcd->hwndLastMenu = CheckMenu(hwnd, &CollectorFileMenu,
                                             COLLECTORFILE_POPUP);
           }
           else {
-            dcd->hwndLastMenu = CheckMenu(&CollectorCnrMenu,
+            dcd->hwndLastMenu = CheckMenu(hwnd, &CollectorCnrMenu,
                                           COLLECTORCNR_POPUP);
             if (dcd->hwndLastMenu && !dcd->cnremphasized) {
@@ -2090 +2092 @@
             if (dcd->hwndLastMenu == CollectorCnrMenu) {
               SetViewMenu(dcd->hwndLastMenu, dcd->flWindowAttr);
-              SetDetailsSwitches(dcd->hwndLastMenu, dcd);
+              SetDetailsSwitches(dcd->hwndLastMenu, dcd);
+              CopyPresParams(dcd->hwndLastMenu, hwnd);
               if (dcd->flWindowAttr & CV_MINI)
                 WinCheckMenuItem(dcd->hwndLastMenu, IDM_MINIICONS, TRUE);