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

trunk/dll/arccnrs.c

@@ -47 +47 @@
   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
 
 ***********************************************************************/
@@ -1187 +1188 @@
   case UM_VIEWSMENU:
     // fixme to disble menu items as needed
-    return MRFROMLONG(CheckMenu(&ArcCnrMenu, ARCCNR_POPUP));
+    return MRFROMLONG(CheckMenu(hwnd, &ArcCnrMenu, ARCCNR_POPUP));
 
   case UM_FILESMENU:
     // fixme to disble menu items as needed
-    return MRFROMLONG(CheckMenu(&ArcMenu, ARC_POPUP));
+    return MRFROMLONG(CheckMenu(hwnd, &ArcMenu, ARC_POPUP));
 
   case MM_PORTHOLEINIT:
@@ -2770 +2771 @@
 
       case IDM_SHOWSELECT:
-        QuickPopup(hwnd, dcd, CheckMenu(&ArcCnrMenu, ARCCNR_POPUP),
+        QuickPopup(hwnd, dcd, CheckMenu(hwnd, &ArcCnrMenu, ARCCNR_POPUP),
                    IDM_SELECTSUBMENU);
         break;
 
       case IDM_SHOWSORT:
-        QuickPopup(hwnd, dcd, CheckMenu(&ArcCnrMenu, ARCCNR_POPUP),
+        QuickPopup(hwnd, dcd, CheckMenu(hwnd, &ArcCnrMenu, ARCCNR_POPUP),
                    IDM_SORTSUBMENU);
         break;
@@ -3295 +3296 @@
                        MPFROM2SHORT(TRUE, CRA_CURSORED));
             MarkAll(hwnd, FALSE, FALSE, TRUE);
-            dcd->hwndLastMenu = CheckMenu(&ArcMenu, ARC_POPUP);
+            dcd->hwndLastMenu = CheckMenu(hwnd, &ArcMenu, ARC_POPUP);
           }
           else {
-            dcd->hwndLastMenu = CheckMenu(&ArcCnrMenu, ARCCNR_POPUP);
+            dcd->hwndLastMenu = CheckMenu(hwnd, &ArcCnrMenu, ARCCNR_POPUP);
             if (dcd->hwndLastMenu && !dcd->cnremphasized) {
               WinSendMsg(hwnd, CM_SETRECORDEMPHASIS, MPVOID,