Changeset 73

Timestamp:

May 23, 2001, 6:59:40 PM (24 years ago)

Author:

umoeller

Message:

Misc changes.

Location:

trunk

Files:

• include/helpers/winh.h (modified) (1 diff)
• src/helpers/dosh.c (modified) (1 diff)
• src/helpers/stringh.c (modified) (3 diffs)
• src/helpers/winh.c (modified) (1 diff)

trunk/include/helpers/winh.h

@@ -205 +205 @@
                                     USHORT afAttribute);
 
+    BOOL XWPENTRY winhSetMenuCondCascade(HWND hwndMenu,
+                                         LONG lDefaultItem);
+
     /*
      *@@ winhRemoveMenuItem:

trunk/src/helpers/dosh.c

@@ -2234 +2234 @@
     if (strlen(pcszExecWithArgs) > 255)
         arc = ERROR_INSUFFICIENT_BUFFER;
+    else
     {
         CHAR szObj[CCHMAXPATH];

trunk/src/helpers/stringh.c

@@ -1152 +1152 @@
  *
  *      <B>Example:</B>
- +          strhFindAttribValue("<PAGE BLAH="data">, "BLAH")
+ +          strhFindAttribValue("<PAGE BLAH=\"data\">", "BLAH")
  +
  +          returns ....................... ^ this address.
@@ -1158 +1158 @@
  *@@added V0.9.0 [umoeller]
  *@@changed V0.9.3 (2000-05-19) [umoeller]: some speed optimizations
+ *@@changed V0.9.12 (2001-05-22) [umoeller]: fixed space bug, thanks Yuri Dario
  */
 
 PSZ strhFindAttribValue(const char *pszSearchIn, const char *pszAttrib)
+{
+   PSZ    prc = 0;
+   PSZ    pszSearchIn2, p;
+   ULONG  cbAttrib = strlen(pszAttrib),
+          ulLength = strlen(pszSearchIn);
+
+   // use alloca(), so memory is freed on function exit
+   pszSearchIn2 = (PSZ)alloca(ulLength + 1);
+   memcpy(pszSearchIn2, pszSearchIn, ulLength + 1);
+
+   // 1) find token, (space char, \n, \r, \t)
+   p = strtok(pszSearchIn2, " \n\r\t");
+   while (p)
+   {
+        CHAR c2;
+        PSZ pOrig;
+
+        // check tag name
+        if (!strnicmp(p, pszAttrib, cbAttrib))
+        {
+            // position in original string
+            pOrig = (PSZ)pszSearchIn + (p - pszSearchIn2);
+
+            // yes:
+            prc = pOrig + cbAttrib;
+            c2 = *prc;
+            while (   (   (c2 == ' ')
+                       || (c2 == '=')
+                       || (c2 == '\n')
+                       || (c2 == '\r')
+                      )
+                    && (c2 != 0)
+                  )
+                c2 = *++prc;
+
+            break;
+        }
+
+        p = strtok(NULL, " \n\r\t");
+   }
+
+   return (prc);
+}
+
+/* PSZ strhFindAttribValue(const char *pszSearchIn, const char *pszAttrib)
 {
     PSZ     prc = 0;
@@ -1211 +1257 @@
     }
     return (prc);
-}
+} */
 
 /*

trunk/src/helpers/winh.c

@@ -448 +448 @@
     }
     return (hwndNewMenu);
+}
+
+/*
+ *@@ winhSetMenuCondCascade:
+ *      sets the "conditional cascade" style
+ *      on the specified submenu.
+ *
+ *      This style must always be enabled manually
+ *      because the resource compiler won't handle it.
+ *
+ *      Note: Pass in the _submenu_ window handle,
+ *      not the one of the parent. With lDefaultItem,
+ *      specify the item ID in the submenu which is
+ *      to be checked as the default item.
+ *
+ *@@added V0.9.12 (2001-05-22) [umoeller]
+ */
+
+BOOL winhSetMenuCondCascade(HWND hwndMenu,          // in: submenu handle
+                            LONG lDefaultItem)      // in: item ID of new default item
+{
+    // stolen from the Warp Toolkit WPS Guide
+    ULONG ulStyle = WinQueryWindowULong(hwndMenu, QWL_STYLE);
+    ulStyle |= MS_CONDITIONALCASCADE;
+    WinSetWindowULong(hwndMenu, QWL_STYLE, ulStyle);
+
+    // make the first item in the subfolder
+    // the default of cascading submenu */
+    return (BOOL)(WinSendMsg(hwndMenu,
+                             MM_SETDEFAULTITEMID,
+                             (MPARAM)lDefaultItem,
+                             0));
 }