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

trunk/dll/misc.c

@@ -35 +35 @@
   01 Sep 07 GKY Use xDosSetPathInfo to fix case where FS3 buffer crosses 64k boundry
   05 Nov 07 GKY Use commafmtULL to display file sizes for large file support
+  22 Nov 07 GKY Use CopyPresParams to fix presparam inconsistencies in menus
 
 ***********************************************************************/
@@ -1564 +1565 @@
       WinSetParent(mi.hwndSubMenu, hwndMenu, FALSE);
       WinSetWindowUShort(mi.hwndSubMenu, QWS_ID, IDM_FILESMENU);
+      CopyPresParams(mi.hwndSubMenu, hwndNow);
       mi.afStyle = MIS_SUBMENU;
       ulStyle = WinQueryWindowULong(mi.hwndSubMenu, QWL_STYLE);
@@ -1595 +1597 @@
       WinSetParent(mi.hwndSubMenu, hwndMenu, FALSE);
       WinSetWindowUShort(mi.hwndSubMenu, QWS_ID, IDM_VIEWSMENU);
+      CopyPresParams(mi.hwndSubMenu, hwndNow);
       mi.afStyle = MIS_SUBMENU;
       ulStyle = WinQueryWindowULong(mi.hwndSubMenu, QWL_STYLE);
@@ -1606 +1609 @@
 }
 
-HWND CheckMenu(HWND * hwndMenu, USHORT id)
+HWND CheckMenu(HWND hwnd, HWND * hwndMenu, USHORT id)
 {
   /* load and adjust menus as required */
@@ -1613 +1616 @@
     if (hwndMenu == &DirMenu) {
       WinSetWindowUShort(DirMenu, QWS_ID, IDM_FILESMENU);
+      CopyPresParams(*hwndMenu, hwnd);
       SetConditionalCascade(DirMenu, IDM_COMMANDSMENU, IDM_DOITYOURSELF);
       SetConditionalCascade(DirMenu, IDM_COPYMENU, IDM_COPY);
@@ -1632 +1636 @@
     else if (hwndMenu == &TreeMenu) {
       WinSetWindowUShort(TreeMenu, QWS_ID, IDM_FILESMENU);
+      CopyPresParams(*hwndMenu, hwnd);
       SetConditionalCascade(TreeMenu, IDM_COMMANDSMENU, IDM_DOITYOURSELF);
       SetConditionalCascade(TreeMenu, IDM_SAVESUBMENU, IDM_SAVETOCLIP);
@@ -1647 +1652 @@
     else if (hwndMenu == &ArcMenu) {
       WinSetWindowUShort(ArcMenu, QWS_ID, IDM_FILESMENU);
+      CopyPresParams(*hwndMenu, hwnd);
       SetConditionalCascade(ArcMenu, IDM_EXTRACTSUBMENU, IDM_EXTRACT);
       SetConditionalCascade(ArcMenu, IDM_EDITSUBMENU, IDM_EDIT);
@@ -1656 +1662 @@
     else if (hwndMenu == &FileMenu) {
       WinSetWindowUShort(FileMenu, QWS_ID, IDM_FILESMENU);
+      CopyPresParams(*hwndMenu, hwnd);
       SetConditionalCascade(FileMenu, IDM_COMMANDSMENU, IDM_DOITYOURSELF);
       SetConditionalCascade(FileMenu, IDM_COPYMENU, IDM_COPY);
@@ -1676 +1683 @@
     else if (hwndMenu == &DirCnrMenu) {
       WinSetWindowUShort(DirCnrMenu, QWS_ID, IDM_VIEWSMENU);
+      CopyPresParams(*hwndMenu, hwnd);
       SetConditionalCascade(DirCnrMenu, IDM_MISCSUBMENU, IDM_SIZES);
       SetConditionalCascade(DirCnrMenu, IDM_OPENSUBMENU, IDM_OPENSETTINGSME);
@@ -1684 +1692 @@
     else if (hwndMenu == &TreeCnrMenu) {
       WinSetWindowUShort(TreeCnrMenu, QWS_ID, IDM_VIEWSMENU);
+      CopyPresParams(*hwndMenu, hwnd);
       SetConditionalCascade(TreeCnrMenu, IDM_PARTITIONSMENU, IDM_PARTITION);
     }
     else if (hwndMenu == &ArcCnrMenu) {
       WinSetWindowUShort(ArcCnrMenu, QWS_ID, IDM_VIEWSMENU);
+      CopyPresParams(*hwndMenu, hwnd);
       SetConditionalCascade(ArcCnrMenu, IDM_EXTRACTSUBMENU, IDM_ARCEXTRACT);
       if (fWorkPlace)
@@ -1695 +1705 @@
     else if (hwndMenu == &CollectorCnrMenu) {
       WinSetWindowUShort(CollectorCnrMenu, QWS_ID, IDM_VIEWSMENU);
+      CopyPresParams(*hwndMenu, hwnd);
       SetConditionalCascade(CollectorCnrMenu, IDM_COLLECTMENU,
                             IDM_COLLECTFROMCLIP);
@@ -1700 +1711 @@
     else if (hwndMenu == &CollectorFileMenu) {
       WinSetWindowUShort(CollectorFileMenu, QWS_ID, IDM_FILESMENU);
+      CopyPresParams(*hwndMenu, hwnd);
       SetConditionalCascade(CollectorFileMenu, IDM_COMMANDSMENU,
                             IDM_DOITYOURSELF);
@@ -1722 +1734 @@
     else if (hwndMenu == &CollectorDirMenu) {
       WinSetWindowUShort(CollectorDirMenu, QWS_ID, IDM_FILESMENU);
+      CopyPresParams(*hwndMenu, hwnd);
       SetConditionalCascade(CollectorDirMenu, IDM_COMMANDSMENU,
                             IDM_DOITYOURSELF);
@@ -1744 +1757 @@
     else if (hwndMenu == &MainPopupMenu) {
       WinSetWindowUShort(MainPopupMenu, QWS_ID, IDM_MAINPOPUP);
+      CopyPresParams(*hwndMenu, hwnd);
       SetConditionalCascade(MainPopupMenu, IDM_TOOLSUBMENU, IDM_TOOLBAR);
       SetConditionalCascade(MainPopupMenu, IDM_AUTOVIEWSUBMENU, IDM_AUTOVIEW);