Changeset 875 for trunk/dll/treecnr.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/treecnr.c (modified) (9 diffs)

trunk/dll/treecnr.c

@@ -459 +459 @@
 
   case UM_VIEWSMENU:
-    return MRFROMLONG(CheckMenu(hwnd, &TreeCnrMenu, TREECNR_POPUP));
+    return MRFROMLONG(CheckMenu(hwndMainMenu, &TreeCnrMenu, TREECNR_POPUP));
 
   case UM_TIMER:
@@ -1018 +1018 @@
       if (pci && (INT) pci != -1) {
         if (IsRoot(pci->pszFileName))
-          menuHwnd = CheckMenu(hwnd, &TreeMenu, TREE_POPUP);
+          menuHwnd = CheckMenu(hwndMainMenu, &TreeMenu, TREE_POPUP);
         else {
-          menuHwnd = CheckMenu(hwnd, &DirMenu, DIR_POPUP);
+          menuHwnd = CheckMenu(hwndMainMenu, &DirMenu, DIR_POPUP);
 //            WinEnableMenuItem(DirMenu,
 //                              IDM_TREE,
@@ -1026 +1026 @@
         }
         if (!(pci->attrFile & FILE_DIRECTORY))
-          menuHwnd = CheckMenu(hwnd, &FileMenu, FILE_POPUP);
+          menuHwnd = CheckMenu(hwndMainMenu, &FileMenu, FILE_POPUP);
       }
       return MRFROMLONG(menuHwnd);
@@ -1593 +1593 @@
             MarkAll(hwnd, FALSE, FALSE, TRUE);
             if (!(pci->attrFile & FILE_DIRECTORY))
-              dcd->hwndLastMenu = CheckMenu(hwnd, &FileMenu, FILE_POPUP);
+              dcd->hwndLastMenu = CheckMenu(hwndMainMenu, &FileMenu, FILE_POPUP);
             else if (!IsRoot(pci->pszFileName))
-              dcd->hwndLastMenu = CheckMenu(hwnd, &DirMenu, DIR_POPUP);
+              dcd->hwndLastMenu = CheckMenu(hwndMainMenu, &DirMenu, DIR_POPUP);
             else
-              dcd->hwndLastMenu = CheckMenu(hwnd, &TreeMenu, TREE_POPUP);
+              dcd->hwndLastMenu = CheckMenu(hwndMainMenu, &TreeMenu, TREE_POPUP);
           }
           else {
-            dcd->hwndLastMenu = CheckMenu(hwnd, &TreeCnrMenu, TREECNR_POPUP);
+            dcd->hwndLastMenu = CheckMenu(hwndMainMenu, &TreeCnrMenu, TREECNR_POPUP);
             if (dcd->hwndLastMenu && !dcd->cnremphasized) {
               WinSendMsg(hwnd, CM_SETRECORDEMPHASIS, MPVOID,
@@ -2092 +2092 @@
                               && writeable);
             WinEnableMenuItem((HWND) mp2, IDM_RENAME, !underenv && writeable);
-            CopyPresParams((HWND) mp2, hwnd);
+            CopyPresParams((HWND) mp2, hwndMainMenu);
 
           }
@@ -2102 +2102 @@
                          IDM_MINIICONS, ((dcd->flWindowAttr & CV_MINI) != 0));
         WinEnableMenuItem((HWND) mp2, IDM_RESELECT, FALSE);
-        CopyPresParams((HWND) mp2, hwnd);
+        CopyPresParams((HWND) mp2, hwndMainMenu);
         break;
 
       case IDM_COMMANDSMENU:
         SetupCommandMenu((HWND) mp2, hwnd);
-        CopyPresParams((HWND) mp2, hwnd);
+        CopyPresParams((HWND) mp2, hwndMainMenu);
         break;
 
       case IDM_SORTSUBMENU:
         SetSortChecks((HWND) mp2, TreesortFlags);
-        CopyPresParams((HWND) mp2, hwnd);
+        CopyPresParams((HWND) mp2, hwndMainMenu);
         break;
 
@@ -2118 +2118 @@
         SetupWinList((HWND) mp2,
                      (hwndMain) ? hwndMain : (HWND) 0, dcd->hwndFrame);
-        CopyPresParams((HWND) mp2, hwnd);
+        CopyPresParams((HWND) mp2, hwndMainMenu);
         break;
       }
@@ -2363 +2363 @@
 
       case IDM_SHOWSORT:
-        QuickPopup(hwnd, dcd, CheckMenu(hwnd, &TreeCnrMenu, TREECNR_POPUP),
+        QuickPopup(hwnd, dcd, CheckMenu(hwndMainMenu, &TreeCnrMenu, TREECNR_POPUP),
                    IDM_SORTSUBMENU);
         break;
 
       case IDM_SHOWSELECT:
-        QuickPopup(hwnd, dcd, CheckMenu(hwnd, &TreeCnrMenu, TREECNR_POPUP),
+        QuickPopup(hwnd, dcd, CheckMenu(hwndMainMenu, &TreeCnrMenu, TREECNR_POPUP),
                    IDM_SELECTSUBMENU);
         break;
@@ -2942 +2942 @@
                                  FM3ModHandle, TREE_FRAME, &hwndClient);
   if (hwndFrame && hwndClient) {
+    hwndMainMenu = WinWindowFromID(hwndFrame, FID_MENU);
     dcd = xmalloc(sizeof(DIRCNRDATA), pszSrcFile, __LINE__);
     if (!dcd) {