Changeset 239

Timestamp:

Jan 10, 2003, 12:03:22 AM (23 years ago)

Author:

umoeller

Message:

Misc fixes.

Location:

trunk

Files:

• include/helpers/dialog.h (modified) (1 diff)
• include/helpers/winh.h (modified) (5 diffs)
• src/helpers/winh.c (modified) (4 diffs)

trunk/include/helpers/dialog.h

@@ -429 +429 @@
             id, CTL_COMMON_FONT, { cx, cy }, COMMON_SPACING }
 
+        // CONTROLDEF_ENTRYFIELD_PASSWD added V1.0.1 (2003-01-05) [umoeller]
+    #define CONTROLDEF_ENTRYFIELD_PASSWD(pcsz, id, cx, cy) { WC_ENTRYFIELD, pcsz, \
+            WS_VISIBLE | WS_TABSTOP | ES_MARGIN | ES_AUTOSCROLL | ES_UNREADABLE, \
+            id, CTL_COMMON_FONT, { cx, cy }, COMMON_SPACING }
+
     #define CONTROLDEF_ENTRYFIELD_RO(pcsz, id, cx, cy) { WC_ENTRYFIELD, pcsz, \
             WS_VISIBLE | WS_TABSTOP | ES_MARGIN | ES_READONLY | ES_AUTOSCROLL, \

trunk/include/helpers/winh.h

@@ -224 +224 @@
         #endif
 
-        BOOL XWPENTRY winhQueryMenuItem(HWND hwndMenu,
-                                        USHORT usItemID,
-                                        BOOL fSearchSubmenus,
-                                        PMENUITEM pmi);
-
-        HWND XWPENTRY winhQuerySubmenu(HWND hMenu, SHORT sID);
-
         /*
          * winhCreateEmptyMenu:
@@ -245 +238 @@
         WinCreateWindow(HWND_DESKTOP, WC_MENU, "", 0, 0, 0, 0, 0,       \
                         HWND_DESKTOP, HWND_TOP, 0, 0, 0)
+
+        BOOL XWPENTRY winhQueryMenuItem(HWND hwndMenu,
+                                        USHORT usItemID,
+                                        BOOL fSearchSubmenus,
+                                        PMENUITEM pmi);
+
+        HWND XWPENTRY winhQuerySubmenu(HWND hMenu, SHORT sID);
 
         SHORT XWPENTRY winhInsertMenuItem(HWND hwndMenu,
@@ -753 +753 @@
     PCSZ XWPENTRY winhQueryDefaultFont(VOID);
 
+    PSZ XWPENTRY winhQueryMenuSysFont(VOID);
+
     BOOL XWPENTRY winhSetWindowFont(HWND hwnd, const char *pcszFont);
     typedef BOOL XWPENTRY WINHSETWINDOWFONT(HWND hwnd, const char *pcszFont);
@@ -879 +881 @@
     HPOINTER XWPENTRY winhSetWaitPointer(VOID);
 
+    PSZ XWPENTRY winhQueryWindowText2(HWND hwnd,
+                                      PULONG pulExtra);
+
     PSZ XWPENTRY winhQueryWindowText(HWND hwnd);
 
@@ -885 +890 @@
                                     ...);
 
+    PSZ XWPENTRY winhQueryDlgItemText2(HWND hwnd,
+                                       USHORT usItemID,
+                                       PULONG pulExtra);
+
     /*
      *@@ winhQueryDlgItemText:
      *      like winhQueryWindowText, but for the dialog item
      *      in hwnd which has the ID usItemID.
-     */
-
-    #define winhQueryDlgItemText(hwnd, usItemID) winhQueryWindowText(WinWindowFromID(hwnd, usItemID))
+     *
+     *@@changed V1.0.1 (2003-01-05) [umoeller]: now using winhQueryDlgItemText2
+     */
+
+    #define winhQueryDlgItemText(hwnd, usItemID) winhQueryDlgItemText2(hwnd, usItemID, NULL)
+
+    BOOL XWPENTRY winhAppendWindowEllipseText(HWND hwnd);
+
+    BOOL XWPENTRY winhAppendDlgItemEllipseText(HWND hwnd,
+                                               USHORT usItemID);
 
     BOOL XWPENTRY winhReplaceWindowText(HWND hwnd,

trunk/src/helpers/winh.c

@@ -2969 +2969 @@
 
 /*
+ *@@ winhQueryMenuSysFont:
+ *      returns the system menu font in a new buffer
+ *      to be free()'d by caller.
+ *
+ *@@added V1.0.1 (2003-01-05) [umoeller]
+ */
+
+PSZ winhQueryMenuSysFont(VOID)
+{
+    PSZ pszStdMenuFont;
+    if (!(pszStdMenuFont = prfhQueryProfileData(HINI_USER,
+                                                PMINIAPP_SYSTEMFONTS, // "PM_SystemFonts",
+                                                PMINIKEY_MENUSFONT, // "Menus",
+                                                NULL)))
+        pszStdMenuFont = prfhQueryProfileData(HINI_USER,
+                                              PMINIAPP_SYSTEMFONTS, // "PM_SystemFonts",
+                                              PMINIKEY_DEFAULTFONT, // "DefaultFont",
+                                              NULL);
+
+    return pszStdMenuFont;
+}
+
+/*
  *@@ winhSetWindowFont:
  *      this sets a window's font by invoking
@@ -3825 +3848 @@
 
 /*
+ *@@ winhQueryWindowText2:
+ *      this returns the window text of the specified
+ *      HWND in a newly allocated buffer.
+ *
+ *      If pulExtra is specified, *pulExtra bytes will
+ *      be allocated in addition to the window text
+ *      length. Useful if you plan to append something
+ *      to the string. On output, *pulExtra receives
+ *      the string length excluding the extra bytes
+ *      and the terminating null byte.
+ *
+ *      Returns NULL on error. Use free()
+ *      to free the return value.
+ *
+ *@@added V1.0.1 (2003-01-05) [umoeller]
+ */
+
+PSZ winhQueryWindowText2(HWND hwnd,         // in: window whose text to query
+                         PULONG pulExtra)   // in: extra bytes to allocate or NULL,
+                                            // out: size of allocated buffer (including null byte)
+{
+    PSZ     pszText = NULL;
+    ULONG   cbText;
+    if (cbText = WinQueryWindowTextLength(hwnd))
+    {
+        ULONG cbExtra = 1;      // additional null character
+        if (pulExtra)
+            cbExtra += *pulExtra;
+
+        if (pszText = (PSZ)malloc(cbText + cbExtra))
+        {
+            WinQueryWindowText(hwnd,
+                               cbText + 1,
+                               pszText);
+            if (pulExtra)
+                *pulExtra = cbText;
+        }
+    }
+
+    return pszText;
+}
+
+/*
  *@@ winhQueryWindowText:
  *      this returns the window text of the specified
@@ -3831 +3897 @@
  *      Returns NULL on error. Use free()
  *      to free the return value.
+ *
+ *@@changed V1.0.1 (2003-01-05) [umoeller]: now using winhQueryWindowText2
  */
 
 PSZ winhQueryWindowText(HWND hwnd)
 {
-    PSZ     pszText = NULL;
-    ULONG   cbText;
-    if (cbText = WinQueryWindowTextLength(hwnd))
-    {
-        if (pszText = (PSZ)malloc(cbText + 1))  // additional null character
-            WinQueryWindowText(hwnd,
-                               cbText + 1,
-                               pszText);
-    }
-
-    return pszText;
+    return winhQueryWindowText2(hwnd, NULL);        // V1.0.1 (2003-01-05) [umoeller]
+}
+
+/*
+ *@@ winhQueryDlgItemText2:
+ *      shortcut around winhQueryWindowText2 to allow for
+ *      specifying a dialog item ID instead.
+ *
+ *@@added V1.0.1 (2003-01-05) [umoeller]
+ */
+
+PSZ winhQueryDlgItemText2(HWND hwnd,
+                          USHORT usItemID,
+                          PULONG pulExtra)
+{
+    return winhQueryWindowText2(WinWindowFromID(hwnd, usItemID),
+                                pulExtra);
 }
 
@@ -3872 +3946 @@
     return WinSetWindowText(hwnd,
                             szBuf);
+}
+
+/*
+ *@@ winhAppendWindowEllipseText:
+ *      appends three dots ("...") to the title
+ *      of the given window.
+ *
+ *@@added V1.0.1 (2003-01-05) [umoeller]
+ */
+
+BOOL winhAppendWindowEllipseText(HWND hwnd)
+{
+    ULONG cbExtra = 3;
+    PSZ psz;
+    BOOL brc = FALSE;
+    if (psz = winhQueryWindowText2(hwnd, &cbExtra))
+    {
+        memcpy(psz + cbExtra, "...", 4);
+        brc = WinSetWindowText(hwnd, psz);
+        free(psz);
+    }
+
+    return brc;
+}
+
+/*
+ *@@ winhAppendDlgItemEllipseText:
+ *
+ *@@added V1.0.1 (2003-01-05) [umoeller]
+ */
+
+BOOL winhAppendDlgItemEllipseText(HWND hwnd,
+                                  USHORT usItemID)
+{
+    return winhAppendWindowEllipseText(WinWindowFromID(hwnd, usItemID));
 }