Changeset 2 for trunk/common.c

Timestamp:

Oct 26, 2012, 12:07:29 AM (12 years ago)

Author:

Andy Willis

Message:

2.61

File:

• trunk/common.c (modified) (3 diffs)

trunk/common.c ¶

@@ -163 +163 @@
 { MENUITEM mi={0},mi1={0};
   POINTL ptl;
-  SHORT sItemId,sItemNum,sLastId,k;
+  SHORT sItemId,sItemNum,sLastId;
   UCHAR ucBuf[64];
   HWND hwndSubmenu;
@@ -171 +171 @@
     sItemId = SHORT1FROMMR(WinSendMsg(plswData->hwndMenu,MM_ITEMIDFROMPOSITION,
                                       MPFROMSHORT(sItemNum-1),0));
-    sItemNum = SHORT1FROMMR(WinSendMsg(plswData->hwndMenu,MM_DELETEITEM,
+    sItemNum = SHORT1FROMMR(WinSendMsg(plswData->hwndMenu,
+                                       sItemId==CMD_XCENTERSUBMENU?MM_REMOVEITEM:MM_DELETEITEM,
                                        MPFROM2SHORT(sItemId,FALSE),0));
   }
@@ -249 +250 @@
     WinSendMsg(plswData->hwndMenu, MM_INSERTITEM, MPFROMP(&mi), MPFROMP(ucBuf));
   }
+#else
+  WinSetPresParam(plswData->pWidget->hwndContextMenu,PP_FONTNAMESIZE,7,"8.Helv");
+
+  if (bTaskBar && iMenuAtItem >= 0) {
+  // now set the old context menu as submenu;
+    WinSendMsg(plswData->hwndMenu, MM_INSERTITEM, MPFROMP(&mi1), MPFROMP(ucBuf));
+
+    mi.afAttribute = mi.hItem = 0;
+    mi.afStyle = MIS_TEXT | MIS_SUBMENU;
+    mi.id = CMD_XCENTERSUBMENU;
+    mi.hwndSubMenu = plswData->pWidget->hwndContextMenu;
+    WinLoadString(plswData->hab,plswData->hmodRes,STRID_XCENTERSUBMENU,sizeof(ucBuf),ucBuf);
+    sItemId = SHORT1FROMMR(WinSendMsg(plswData->hwndMenu, MM_INSERTITEM, MPFROMP(&mi),MPFROMP(ucBuf)));
+  }
 #endif
 
+  WinQueryPointerPos(HWND_DESKTOP,&ptl);
 #ifdef XWORKPLACE
-// now copy the old context menu as submenu;
-// this code adapted from XCenter winlist widget
-  if (bTaskBar) {
-    if (iMenuAtItem >= 0) {
-      WinSendMsg(plswData->hwndMenu, MM_INSERTITEM, MPFROMP(&mi1), MPFROMP(ucBuf));
-
-      hwndSubmenu = WinCreateMenu(plswData->hwndMenu, NULL);
-
-//      WinSetWindowUShort(hwndSubmenu,QWS_ID,CMD_XCENTERSUBMENU);
-
-      mi.afAttribute = mi.hItem = 0;
-      mi.afStyle = MIS_TEXT | MIS_SUBMENU;
-      mi.id = CMD_XCENTERSUBMENU;
-      mi.hwndSubMenu = hwndSubmenu;
-
-      WinLoadString(plswData->hab,plswData->hmodRes,STRID_XCENTERSUBMENU,sizeof(ucBuf),ucBuf);
-
-      sItemId = SHORT1FROMMR(WinSendMsg(plswData->hwndMenu, MM_INSERTITEM, MPFROMP(&mi),MPFROMP(ucBuf)));
-    } else
-      sItemId = 0;
-
-    if (sItemId != MIT_MEMERROR && sItemId != MIT_ERROR) {
-      sItemNum = SHORT1FROMMR(WinSendMsg(plswData->pWidget->hwndContextMenu,
-                                         MM_QUERYITEMCOUNT, 0, 0));
-
-      // loop through all entries in the original menu
-      for (k = 0; k < sItemNum; k++) {
-        sItemId = SHORT1FROMMR(WinSendMsg(plswData->pWidget->hwndContextMenu,
-                               MM_ITEMIDFROMPOSITION, MPFROMSHORT(k), 0));
-      // get this menu item into mi buffer
-        WinSendMsg(plswData->pWidget->hwndContextMenu, MM_QUERYITEM,
-                   MPFROM2SHORT(sItemId, FALSE), MPFROMP(&mi));
-        if (mi.id==ID_CRMI_PROPERTIES) mi.id = CMD_SHOWSETTINGS;
-      // query text of this menu entry into our buffer
-        WinSendMsg(plswData->pWidget->hwndContextMenu, MM_QUERYITEMTEXT,
-                   MPFROM2SHORT(sItemId, sizeof(ucBuf)-1), MPFROMP(ucBuf));
-      // add this entry to our new menu
-        mi.iPosition = MIT_END;
-        WinSendMsg(iMenuAtItem < 0 ? plswData->hwndMenu : hwndSubmenu,
-                   MM_INSERTITEM, MPFROMP(&mi), MPFROMP(ucBuf));
-      }
-    }
-  }
+  WinPopupMenu(HWND_DESKTOP, bTaskBar?plswData->hwndTaskBarClient:plswData->hwndPopClient,
+               (iMenuAtItem<0&&bTaskBar)?plswData->pWidget->hwndContextMenu:plswData->hwndMenu,
+               ptl.x, ptl.y,0, PU_HCONSTRAIN | PU_VCONSTRAIN | PU_MOUSEBUTTON1 | PU_MOUSEBUTTON2 | PU_KEYBOARD);
+#else
+  WinPopupMenu(HWND_DESKTOP, bTaskBar?plswData->hwndTaskBarClient:plswData->hwndPopClient,plswData->hwndMenu,
+               ptl.x, ptl.y,0, PU_HCONSTRAIN | PU_VCONSTRAIN | PU_MOUSEBUTTON1 | PU_MOUSEBUTTON2 | PU_KEYBOARD);
 #endif
-
-  WinQueryPointerPos(HWND_DESKTOP,&ptl);
-  WinPopupMenu(HWND_DESKTOP, bTaskBar?plswData->hwndTaskBarClient:plswData->hwndPopClient, plswData->hwndMenu, ptl.x, ptl.y,
-               0, PU_HCONSTRAIN | PU_VCONSTRAIN | PU_MOUSEBUTTON1 | PU_MOUSEBUTTON2 | PU_KEYBOARD);
 }