Changeset 921 for trunk/dll/misc.c

Timestamp:

Jan 13, 2008, 2:21:00 AM (18 years ago)

Author:

Steven Levine

Message:

Rework Config menu. Move some to submenu. Add drag&drop dialog toggle.
Rework Walk dialog. Put entry field at the top.

File:

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

trunk/dll/misc.c

@@ -36 +36 @@
   05 Nov 07 GKY Use commafmtULL to display file sizes for large file support
   22 Nov 07 GKY Use CopyPresParams to fix presparam inconsistencies in menus
+  12 Jan 08 SHL Document SetConditionalCascade
 
 ***********************************************************************/
@@ -792 +793 @@
                 return FALSE;
             if (DosQueryPathInfo(pci->pszFileName,
-                                 FIL_QUERYFULLNAME, szData, sizeof(szData))){
+                                 FIL_QUERYFULLNAME,
+                                 szData,
+                                 sizeof(szData)))
+            {
               pci->pszFileName = xrealloc(pci->pszFileName, sizeof(szData), pszSrcFile, __LINE__);
               strcpy(szData, pci->pszFileName);
@@ -915 +919 @@
     fclose(fp);
     ret = runemf2(SEPARATE | WINDOWED, HWND_DESKTOP, pszSrcFile, __LINE__,
-                  NULL, NULL,
-                  "VIEW.EXE \"%s\"",
-                  BldQuotedFileName(szQuotedFileName, filename));
+                  NULL, NULL,
+                  "VIEW.EXE \"%s\"",
+                  BldQuotedFileName(szQuotedFileName, filename));
   }
 
@@ -1070 +1074 @@
 }
 
+/**
+ * Set default menu item to invoke for top level conditional cascade menu
+ * @param def is default menu id (i.e. IDM_...)
+ */
+
 VOID SetConditionalCascade(HWND hwndMenu, USHORT id, USHORT def)
 {
@@ -1075 +1084 @@
 
   mi.iPosition = MIT_END;
-  mi.hItem = 0L;
-  mi.hwndSubMenu = (HWND) 0;
+  mi.hItem = 0;
+  mi.hwndSubMenu = (HWND)0;
   mi.afAttribute = 0;
   mi.afStyle = MIS_TEXT;
-  if (WinSendMsg
-      (hwndMenu, MM_QUERYITEM, MPFROM2SHORT(id, TRUE), MPFROMP(&mi))) {
+  if (WinSendMsg(hwndMenu,
+                 MM_QUERYITEM,
+                 MPFROM2SHORT(id, TRUE),
+                 MPFROMP(&mi)))
+  {
     WinSetWindowBits(mi.hwndSubMenu, QWL_STYLE, MS_CONDITIONALCASCADE,
                      MS_CONDITIONALCASCADE);
@@ -1412 +1424 @@
       QMSG qmsg;
       for (;;) {
-        DosSleep(1);
-        rc = WinPostMsg(h, msg, mp1, mp2);
-        if (rc)
-          break;                        // OK
-        if (!WinIsWindow((HAB) 0, h))
-          break;                        // Window gone
-        if (WinPeekMsg((HAB) 0, &qmsg, (HWND) 0, 0, 0, PM_NOREMOVE))
-          break;                        // Queue has message(s)
+        DosSleep(1);
+        rc = WinPostMsg(h, msg, mp1, mp2);
+        if (rc)
+          break;                        // OK
+        if (!WinIsWindow((HAB) 0, h))
+          break;                        // Window gone
+        if (WinPeekMsg((HAB) 0, &qmsg, (HWND) 0, 0, 0, PM_NOREMOVE))
+          break;                        // Queue has message(s)
       }                         // for
     }
@@ -1483 +1495 @@
       list[1] = NULL;
       ExecOnList(hwnd, binview, WINDOWED | SEPARATE, NULL, list, NULL,
-                 pszSrcFile, __LINE__);
+                 pszSrcFile, __LINE__);
       return;
     }
@@ -1511 +1523 @@
       list[1] = NULL;
       ExecOnList(hwnd, bined, WINDOWED | SEPARATE, NULL, list, NULL,
-                 pszSrcFile, __LINE__);
+                 pszSrcFile, __LINE__);
       return;
     }
@@ -1521 +1533 @@
       list[1] = NULL;
       ExecOnList(hwnd, editor, WINDOWED | SEPARATE, NULL, list, NULL,
-                 pszSrcFile, __LINE__);
+                 pszSrcFile, __LINE__);
       return;
     }