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

trunk/dll/dircnrs.c

@@ -475 +475 @@
 
   case UM_VIEWSMENU:
-    return MRFROMLONG(CheckMenu(hwndMainMenu, &DirCnrMenu, DIRCNR_POPUP));
+    return MRFROMLONG(CheckMenu(hwnd, &DirCnrMenu, DIRCNR_POPUP));
 
   case UM_DRIVECMD:
@@ -1554 +1554 @@
       switch (SHORT1FROMMP(mp1)) {
       case IDM_FILESMENU:
-        if (isalpha(*dcd->directory)) {
+        CopyPresParams((HWND) mp2, hwndMainMenu);
+        if (isalpha(*dcd->directory)) {
           if (driveflags[toupper(*dcd->directory) - 'A'] & DRIVE_NOTWRITEABLE) {
             WinEnableMenuItem((HWND) mp2, IDM_MOVEMENU, FALSE);
@@ -1578 +1579 @@
             WinEnableMenuItem((HWND) mp2, IDM_EDITBINARY, TRUE);
             WinEnableMenuItem((HWND) mp2, IDM_ATTRS, TRUE);
-            CopyPresParams((HWND) mp2, hwndMainMenu);
           }
         }
@@ -1585 +1585 @@
       case IDM_VIEWSMENU:
         SetViewMenu((HWND) mp2, dcd->flWindowAttr);
-        WinEnableMenuItem((HWND) mp2, IDM_RESELECT,
+        CopyPresParams((HWND) mp2, hwndMainMenu);
+        WinEnableMenuItem((HWND) mp2, IDM_RESELECT,
                           (dcd->lastselection != NULL));
-        CopyPresParams((HWND) mp2, hwndMainMenu);
-        if (isalpha(*dcd->directory)) {
+        if (isalpha(*dcd->directory)) {
           if (driveflags[toupper(*dcd->directory) - 'A'] & DRIVE_NOTWRITEABLE)
             WinEnableMenuItem((HWND) mp2, IDM_MKDIR, FALSE);
@@ -1793 +1793 @@
         QuickPopup(hwnd,
                    dcd,
-                   CheckMenu(hwndMainMenu, &DirCnrMenu, DIRCNR_POPUP), IDM_SELECTSUBMENU);
+                   CheckMenu(hwnd, &DirCnrMenu, DIRCNR_POPUP), IDM_SELECTSUBMENU);
         break;
 
       case IDM_SHOWSORT:
-        QuickPopup(hwnd, dcd, CheckMenu(hwndMainMenu, &DirCnrMenu, DIRCNR_POPUP),
+        QuickPopup(hwnd, dcd, CheckMenu(hwnd, &DirCnrMenu, DIRCNR_POPUP),
                    IDM_SORTSUBMENU);
         break;
@@ -2646 +2646 @@
                        CM_SETRECORDEMPHASIS,
                        MPFROMP(pci), MPFROM2SHORT(TRUE, CRA_CURSORED));
-            MarkAll(hwnd, FALSE, FALSE, TRUE);
-            if (pci->attrFile & FILE_DIRECTORY)
+            MarkAll(hwnd, FALSE, FALSE, TRUE);
+            if (pci->attrFile & FILE_DIRECTORY)
               dcd->hwndLastMenu = CheckMenu(hwndMainMenu, &DirMenu, DIR_POPUP);
             else
@@ -2653 +2653 @@
           }
           else {
-            dcd->hwndLastMenu = CheckMenu(hwndMainMenu, &DirCnrMenu, DIRCNR_POPUP);
+            dcd->hwndLastMenu = CheckMenu(hwnd, &DirCnrMenu, DIRCNR_POPUP);
             if (dcd->hwndLastMenu && !dcd->cnremphasized) {
               WinSendMsg(hwnd,
@@ -3383 +3383 @@
         idinc = 0;
       WinSetWindowUShort(hwndFrame, QWS_ID, id);
-      hwndMainMenu = WinWindowFromID(hwndFrame, FID_MENU);
       dcd = xmallocz(sizeof(DIRCNRDATA), pszSrcFile, __LINE__);
       if (!dcd) {