Changeset 875 for trunk/dll/dircnrs.c

Timestamp:

Nov 24, 2007, 12:14:45 AM (18 years ago)

Author:

Gregg Young

Message:

Used global variable to link presparams to main menu window for both drop down and pop up menus

File:

• trunk/dll/dircnrs.c (modified) (7 diffs)

trunk/dll/dircnrs.c

@@ -475 +475 @@
 
   case UM_VIEWSMENU:
-    return MRFROMLONG(CheckMenu(hwnd, &DirCnrMenu, DIRCNR_POPUP));
+    return MRFROMLONG(CheckMenu(hwndMainMenu, &DirCnrMenu, DIRCNR_POPUP));
 
   case UM_DRIVECMD:
@@ -1578 +1578 @@
             WinEnableMenuItem((HWND) mp2, IDM_EDITBINARY, TRUE);
             WinEnableMenuItem((HWND) mp2, IDM_ATTRS, TRUE);
-            CopyPresParams((HWND) mp2, hwnd);
+            CopyPresParams((HWND) mp2, hwndMainMenu);
           }
         }
@@ -1587 +1587 @@
         WinEnableMenuItem((HWND) mp2, IDM_RESELECT,
                           (dcd->lastselection != NULL));
-        CopyPresParams((HWND) mp2, hwnd);
+        CopyPresParams((HWND) mp2, hwndMainMenu);
         if (isalpha(*dcd->directory)) {
           if (driveflags[toupper(*dcd->directory) - 'A'] & DRIVE_NOTWRITEABLE)
@@ -1793 +1793 @@
         QuickPopup(hwnd,
                    dcd,
-                   CheckMenu(hwnd, &DirCnrMenu, DIRCNR_POPUP), IDM_SELECTSUBMENU);
+                   CheckMenu(hwndMainMenu, &DirCnrMenu, DIRCNR_POPUP), IDM_SELECTSUBMENU);
         break;
 
       case IDM_SHOWSORT:
-        QuickPopup(hwnd, dcd, CheckMenu(hwnd, &DirCnrMenu, DIRCNR_POPUP),
+        QuickPopup(hwnd, dcd, CheckMenu(hwndMainMenu, &DirCnrMenu, DIRCNR_POPUP),
                    IDM_SORTSUBMENU);
         break;
@@ -2562 +2562 @@
       if (pci && (INT) pci != -1) {
         if (pci->attrFile & FILE_DIRECTORY) {
-          menuHwnd = CheckMenu(hwnd, &DirMenu, DIR_POPUP);
+          menuHwnd = CheckMenu(hwndMainMenu, &DirMenu, DIR_POPUP);
 //            WinEnableMenuItem(DirMenu,IDM_TREE,TRUE);
         }
         else
-          menuHwnd = CheckMenu(hwnd, &FileMenu, FILE_POPUP);
+          menuHwnd = CheckMenu(hwndMainMenu, &FileMenu, FILE_POPUP);
       }
       return MRFROMLONG(menuHwnd);
@@ -2648 +2648 @@
             MarkAll(hwnd, FALSE, FALSE, TRUE);
             if (pci->attrFile & FILE_DIRECTORY)
-              dcd->hwndLastMenu = CheckMenu(hwnd, &DirMenu, DIR_POPUP);
+              dcd->hwndLastMenu = CheckMenu(hwndMainMenu, &DirMenu, DIR_POPUP);
             else
-              dcd->hwndLastMenu = CheckMenu(hwnd, &FileMenu, FILE_POPUP);
+              dcd->hwndLastMenu = CheckMenu(hwndMainMenu, &FileMenu, FILE_POPUP);
           }
           else {
-            dcd->hwndLastMenu = CheckMenu(hwnd, &DirCnrMenu, DIRCNR_POPUP);
+            dcd->hwndLastMenu = CheckMenu(hwndMainMenu, &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) {