Changeset 877 for trunk/dll/misc.c

Timestamp:

Nov 24, 2007, 8:50:52 PM (18 years ago)

Author:

Gregg Young

Message:

Cleaned up actual fix for drop down menu fonts and colors not matching.

File:

• trunk/dll/misc.c (modified) (12 diffs)

trunk/dll/misc.c

@@ -1565 +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);
@@ -1597 +1596 @@
       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);
@@ -1614 +1612 @@
   if (!*hwndMenu || !WinIsWindow((HAB) 0, *hwndMenu)) {
     *hwndMenu = WinLoadMenu(HWND_DESKTOP, FM3ModHandle, id);
+    CopyPresParams(*hwndMenu, hwnd);
     if (hwndMenu == &DirMenu) {
       WinSetWindowUShort(DirMenu, QWS_ID, IDM_FILESMENU);
-      CopyPresParams(*hwndMenu, hwnd);
       SetConditionalCascade(DirMenu, IDM_COMMANDSMENU, IDM_DOITYOURSELF);
       SetConditionalCascade(DirMenu, IDM_COPYMENU, IDM_COPY);
@@ -1636 +1634 @@
     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);
@@ -1652 +1649 @@
     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);
@@ -1662 +1658 @@
     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);
@@ -1683 +1678 @@
     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);
@@ -1692 +1686 @@
     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)
@@ -1705 +1697 @@
     else if (hwndMenu == &CollectorCnrMenu) {
       WinSetWindowUShort(CollectorCnrMenu, QWS_ID, IDM_VIEWSMENU);
-      CopyPresParams(*hwndMenu, hwnd);
       SetConditionalCascade(CollectorCnrMenu, IDM_COLLECTMENU,
                             IDM_COLLECTFROMCLIP);
@@ -1711 +1702 @@
     else if (hwndMenu == &CollectorFileMenu) {
       WinSetWindowUShort(CollectorFileMenu, QWS_ID, IDM_FILESMENU);
-      CopyPresParams(*hwndMenu, hwnd);
       SetConditionalCascade(CollectorFileMenu, IDM_COMMANDSMENU,
                             IDM_DOITYOURSELF);
@@ -1734 +1724 @@
     else if (hwndMenu == &CollectorDirMenu) {
       WinSetWindowUShort(CollectorDirMenu, QWS_ID, IDM_FILESMENU);
-      CopyPresParams(*hwndMenu, hwnd);
       SetConditionalCascade(CollectorDirMenu, IDM_COMMANDSMENU,
                             IDM_DOITYOURSELF);
@@ -1757 +1746 @@
     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);
     }
   }
+  CopyPresParams(*hwndMenu, hwnd);
   return *hwndMenu;
 }