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

trunk/dll/mainwnd.c

@@ -42 +42 @@
   19 Aug 07 SHL Rework SaveDirCnrState to return better error info
   30 Aug 07 SHL Add accelerator support to quicklist windows
+  22 Nov 07 GKY Use CopyPresParams to fix presparam inconsistencies in menus
 
 ***********************************************************************/
@@ -1268 +1269 @@
       hwndMenu = WinLoadMenu(hwnd, FM3ModHandle, ID_BUTTONMENU);
     DosExitCritSec();
-    SetPresParams(hwndMenu, NULL, NULL, NULL, GetPString(IDS_10SYSPROTEXT));
+    // SetPresParams(hwndMenu, NULL, NULL, NULL, GetPString(IDS_10SYSPROTEXT));
     if (PopupMenu(hwnd, hwnd, hwndMenu))
       WinShowWindow(hwndMenu, TRUE);
@@ -2179 +2180 @@
 
       SetPresParams(hwnd,
-                    &RGBGREY,
-                    &RGBBLACK, &RGBGREY, GetPString(IDS_8HELVBOLDTEXT));
+                    &RGBGREY,
+                    &RGBBLACK, &RGBGREY, GetPString(IDS_8HELVBOLDTEXT));
       return mr;
     }
@@ -5445 +5446 @@
   case UM_CONTEXTMENU:
   case WM_CONTEXTMENU:
-    if (CheckMenu(&MainPopupMenu, MAIN_POPUP)) {
+    if (CheckMenu(hwnd, &MainPopupMenu, MAIN_POPUP)) {
       SetToggleChecks(MainPopupMenu);
       PopupMenu(hwnd, hwnd, MainPopupMenu);