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

trunk/dll/dircnrs.c

@@ -31 +31 @@
   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
 
 ***********************************************************************/
@@ -132 +132 @@
             }
           }
-          hwndButtonPopup = WinLoadMenu(HWND_DESKTOP, FM3ModHandle, id);
+          hwndButtonPopup = WinLoadMenu(HWND_DESKTOP, FM3ModHandle, id);
+          CopyPresParams(hwndButtonPopup, hwnd);
           if (hwndButtonPopup) {
             WinSetWindowUShort(hwndButtonPopup, QWS_ID, id);
@@ -474 +475 @@
 
   case UM_VIEWSMENU:
-    return MRFROMLONG(CheckMenu(&DirCnrMenu, DIRCNR_POPUP));
+    return MRFROMLONG(CheckMenu(hwnd, &DirCnrMenu, DIRCNR_POPUP));
 
   case UM_DRIVECMD:
@@ -1576 +1577 @@
             WinEnableMenuItem((HWND) mp2, IDM_EDITTEXT, TRUE);
             WinEnableMenuItem((HWND) mp2, IDM_EDITBINARY, TRUE);
-            WinEnableMenuItem((HWND) mp2, IDM_ATTRS, TRUE);
+            WinEnableMenuItem((HWND) mp2, IDM_ATTRS, TRUE);
+            CopyPresParams((HWND) mp2, hwnd);
           }
         }
@@ -1582 +1584 @@
 
       case IDM_VIEWSMENU:
-        SetViewMenu((HWND) mp2, dcd->flWindowAttr);
+        SetViewMenu((HWND) mp2, dcd->flWindowAttr);
         WinEnableMenuItem((HWND) mp2, IDM_RESELECT,
-                          (dcd->lastselection != NULL));
+                          (dcd->lastselection != NULL));
+        CopyPresParams((HWND) mp2, hwnd);
         if (isalpha(*dcd->directory)) {
           if (driveflags[toupper(*dcd->directory) - 'A'] & DRIVE_NOTWRITEABLE)
@@ -1790 +1793 @@
         QuickPopup(hwnd,
                    dcd,
-                   CheckMenu(&DirCnrMenu, DIRCNR_POPUP), IDM_SELECTSUBMENU);
+                   CheckMenu(hwnd, &DirCnrMenu, DIRCNR_POPUP), IDM_SELECTSUBMENU);
         break;
 
       case IDM_SHOWSORT:
-        QuickPopup(hwnd, dcd, CheckMenu(&DirCnrMenu, DIRCNR_POPUP),
+        QuickPopup(hwnd, dcd, CheckMenu(hwnd, &DirCnrMenu, DIRCNR_POPUP),
                    IDM_SORTSUBMENU);
         break;
@@ -2559 +2562 @@
       if (pci && (INT) pci != -1) {
         if (pci->attrFile & FILE_DIRECTORY) {
-          menuHwnd = CheckMenu(&DirMenu, DIR_POPUP);
+          menuHwnd = CheckMenu(hwnd, &DirMenu, DIR_POPUP);
 //            WinEnableMenuItem(DirMenu,IDM_TREE,TRUE);
         }
         else
-          menuHwnd = CheckMenu(&FileMenu, FILE_POPUP);
+          menuHwnd = CheckMenu(hwnd, &FileMenu, FILE_POPUP);
       }
       return MRFROMLONG(menuHwnd);
@@ -2645 +2648 @@
             MarkAll(hwnd, FALSE, FALSE, TRUE);
             if (pci->attrFile & FILE_DIRECTORY)
-              dcd->hwndLastMenu = CheckMenu(&DirMenu, DIR_POPUP);
+              dcd->hwndLastMenu = CheckMenu(hwnd, &DirMenu, DIR_POPUP);
             else
-              dcd->hwndLastMenu = CheckMenu(&FileMenu, FILE_POPUP);
+              dcd->hwndLastMenu = CheckMenu(hwnd, &FileMenu, FILE_POPUP);
           }
           else {
-            dcd->hwndLastMenu = CheckMenu(&DirCnrMenu, DIRCNR_POPUP);
+            dcd->hwndLastMenu = CheckMenu(hwnd, &DirCnrMenu, DIRCNR_POPUP);
             if (dcd->hwndLastMenu && !dcd->cnremphasized) {
               WinSendMsg(hwnd,