Changeset 872 for trunk/dll/treecnr.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/treecnr.c (modified) (8 diffs)

trunk/dll/treecnr.c

@@ -41 +41 @@
   22 Aug 07 SHL Disable DbgMsgs shipped with 3.0.8beta1
   26 Aug 07 SHL Revert to DosSleep(0)
+  22 Nov 07 GKY Use CopyPresParams to fix presparam inconsistencies in menus
 
 ***********************************************************************/
@@ -458 +459 @@
 
   case UM_VIEWSMENU:
-    return MRFROMLONG(CheckMenu(&TreeCnrMenu, TREECNR_POPUP));
+    return MRFROMLONG(CheckMenu(hwnd, &TreeCnrMenu, TREECNR_POPUP));
 
   case UM_TIMER:
@@ -1017 +1018 @@
       if (pci && (INT) pci != -1) {
         if (IsRoot(pci->pszFileName))
-          menuHwnd = CheckMenu(&TreeMenu, TREE_POPUP);
+          menuHwnd = CheckMenu(hwnd, &TreeMenu, TREE_POPUP);
         else {
-          menuHwnd = CheckMenu(&DirMenu, DIR_POPUP);
+          menuHwnd = CheckMenu(hwnd, &DirMenu, DIR_POPUP);
 //            WinEnableMenuItem(DirMenu,
 //                              IDM_TREE,
@@ -1025 +1026 @@
         }
         if (!(pci->attrFile & FILE_DIRECTORY))
-          menuHwnd = CheckMenu(&FileMenu, FILE_POPUP);
+          menuHwnd = CheckMenu(hwnd, &FileMenu, FILE_POPUP);
       }
       return MRFROMLONG(menuHwnd);
@@ -1592 +1593 @@
             MarkAll(hwnd, FALSE, FALSE, TRUE);
             if (!(pci->attrFile & FILE_DIRECTORY))
-              dcd->hwndLastMenu = CheckMenu(&FileMenu, FILE_POPUP);
+              dcd->hwndLastMenu = CheckMenu(hwnd, &FileMenu, FILE_POPUP);
             else if (!IsRoot(pci->pszFileName))
-              dcd->hwndLastMenu = CheckMenu(&DirMenu, DIR_POPUP);
+              dcd->hwndLastMenu = CheckMenu(hwnd, &DirMenu, DIR_POPUP);
             else
-              dcd->hwndLastMenu = CheckMenu(&TreeMenu, TREE_POPUP);
+              dcd->hwndLastMenu = CheckMenu(hwnd, &TreeMenu, TREE_POPUP);
           }
           else {
-            dcd->hwndLastMenu = CheckMenu(&TreeCnrMenu, TREECNR_POPUP);
+            dcd->hwndLastMenu = CheckMenu(hwnd, &TreeCnrMenu, TREECNR_POPUP);
             if (dcd->hwndLastMenu && !dcd->cnremphasized) {
               WinSendMsg(hwnd, CM_SETRECORDEMPHASIS, MPVOID,
@@ -2090 +2091 @@
             WinEnableMenuItem((HWND) mp2, IDM_MOVEMENU, !underenv
                               && writeable);
-            WinEnableMenuItem((HWND) mp2, IDM_RENAME, !underenv && writeable);
+            WinEnableMenuItem((HWND) mp2, IDM_RENAME, !underenv && writeable);
+            CopyPresParams((HWND) mp2, hwnd);
 
           }
@@ -2099 +2101 @@
         WinCheckMenuItem((HWND) mp2,
                          IDM_MINIICONS, ((dcd->flWindowAttr & CV_MINI) != 0));
-        WinEnableMenuItem((HWND) mp2, IDM_RESELECT, FALSE);
+        WinEnableMenuItem((HWND) mp2, IDM_RESELECT, FALSE);
+        CopyPresParams((HWND) mp2, hwnd);
         break;
 
       case IDM_COMMANDSMENU:
-        SetupCommandMenu((HWND) mp2, hwnd);
+        SetupCommandMenu((HWND) mp2, hwnd);
+        CopyPresParams((HWND) mp2, hwnd);
         break;
 
       case IDM_SORTSUBMENU:
         SetSortChecks((HWND) mp2, TreesortFlags);
-        break;
+        CopyPresParams((HWND) mp2, hwnd);
+        break;
 
       case IDM_WINDOWSMENU:
         SetupWinList((HWND) mp2,
-                     (hwndMain) ? hwndMain : (HWND) 0, dcd->hwndFrame);
+                     (hwndMain) ? hwndMain : (HWND) 0, dcd->hwndFrame);
+        CopyPresParams((HWND) mp2, hwnd);
         break;
       }
@@ -2357 +2363 @@
 
       case IDM_SHOWSORT:
-        QuickPopup(hwnd, dcd, CheckMenu(&TreeCnrMenu, TREECNR_POPUP),
+        QuickPopup(hwnd, dcd, CheckMenu(hwnd, &TreeCnrMenu, TREECNR_POPUP),
                    IDM_SORTSUBMENU);
         break;
 
       case IDM_SHOWSELECT:
-        QuickPopup(hwnd, dcd, CheckMenu(&TreeCnrMenu, TREECNR_POPUP),
+        QuickPopup(hwnd, dcd, CheckMenu(hwnd, &TreeCnrMenu, TREECNR_POPUP),
                    IDM_SELECTSUBMENU);
         break;