Changeset 168

Timestamp:

Jun 2, 2002, 10:50:25 PM (23 years ago)

Author:

umoeller

Message:

Fixes for ip widget.

Location:

trunk

Files:

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

trunk/include/helpers/comctl.h

@@ -1059 +1059 @@
     BOOL ctlMakeHotkeyEntryField(HWND hwndHotkeyEntryField);
 
+    /* ******************************************************************
+     *
+     *   Color rectangle
+     *
+     ********************************************************************/
+
+    BOOL ctlMakeColorRect(HWND hwndStatic);
+    typedef BOOL CTLMAKECOLORRECT(HWND hwndStatic);
+    typedef CTLMAKECOLORRECT *PCTLMAKECOLORRECT;
+
 #endif
 

trunk/include/helpers/dialog.h

@@ -479 +479 @@
     } DLGARRAY, *PDLGARRAY;
 
-    APIRET dlghCreateArray(ULONG cMaxItems,
-                           PDLGARRAY *ppArray);
+    APIRET dlghCreateArray(ULONG cMaxItems, PDLGARRAY *ppArray);
+    typedef APIRET DLGHCREATEARRAY(ULONG cMaxItems, PDLGARRAY *ppArray);
+    typedef DLGHCREATEARRAY *PDLGHCREATEARRAY;
 
     APIRET dlghFreeArray(PDLGARRAY *ppArray);
+    typedef APIRET DLGHFREEARRAY(PDLGARRAY *ppArray);
+    typedef DLGHFREEARRAY *PDLGHFREEARRAY;
 
     APIRET dlghAppendToArray(PDLGARRAY pArray,
                              PCDLGHITEM paItems,
                              ULONG cItems);
+    typedef APIRET DLGHAPPENDTOARRAY(PDLGARRAY pArray,
+                                     PCDLGHITEM paItems,
+                                     ULONG cItems);
+    typedef DLGHAPPENDTOARRAY *PDLGHAPPENDTOARRAY;
 
     /* ******************************************************************

trunk/src/helpers/comctl.c

@@ -89 +89 @@
 #define INCL_WINBUTTONS
 #define INCL_WINSTDCNR
+#define INCL_WINENTRYFIELDS
 
 #define INCL_GPIPRIMITIVES
@@ -1430 +1431 @@
 }
 
+/* ******************************************************************
+ *
+ *   Color rectangle
+ *
+ ********************************************************************/
+
+static PFNWP G_pfnwpOrigStatic = NULL;
+
+/*
+ *@@ ctl_fnwpSubclassedColorRect:
+ *      window procedure for subclassed static frames representing
+ *      a color.
+ *
+ *      The control simply paints itself as a rectangle with the
+ *      color specified in its PP_BACKGROUNDCOLOR presentation
+ *      parameter. If a window text is set for the control, it is
+ *      painted with the PP_FOREGROUNDCOLOR color.
+ *
+ *      If the user drags a color onto the control, it notifies
+ *      its owner with the WM_CONTROL message and the EN_CHANGE
+ *      notification code, as with any entry field (since the
+ *      static control knows no notifications, we use that code
+ *      instead).
+ *
+ *@@added V0.9.16 (2002-01-05) [umoeller]
+ *@@changed V0.9.19 (2002-06-02) [umoeller]: moved this here from w_pulse.c
+ */
+
+static MRESULT EXPENTRY ctl_fnwpSubclassedColorRect(HWND hwndStatic, ULONG msg, MPARAM mp1, MPARAM mp2)
+{
+    MRESULT mrc = 0;
+
+    switch (msg)
+    {
+        case WM_PAINT:
+        {
+            LONG    lColor;
+            RECTL   rclPaint;
+            PSZ     pszText;
+
+            HPS hps = WinBeginPaint(hwndStatic,
+                                    NULLHANDLE, // HPS
+                                    NULL); // PRECTL
+            gpihSwitchToRGB(hps);
+            WinQueryWindowRect(hwndStatic,
+                               &rclPaint);      // exclusive
+            lColor = winhQueryPresColor(hwndStatic,
+                                        PP_BACKGROUNDCOLOR,
+                                        FALSE,      // no inherit
+                                        SYSCLR_DIALOGBACKGROUND);
+
+            // make rect inclusive
+            rclPaint.xRight--;
+            rclPaint.yTop--;
+
+            // draw interior
+            GpiSetColor(hps, lColor);
+            gpihBox(hps,
+                    DRO_FILL,
+                    &rclPaint);
+
+            // draw frame
+            GpiSetColor(hps, RGBCOL_BLACK);
+            gpihBox(hps,
+                    DRO_OUTLINE,
+                    &rclPaint);
+
+            if (pszText = winhQueryWindowText(hwndStatic))
+            {
+                GpiSetColor(hps,
+                            winhQueryPresColor(hwndStatic,
+                                               PP_FOREGROUNDCOLOR,
+                                               FALSE,
+                                               -1));
+                WinDrawText(hps,
+                            strlen(pszText),
+                            pszText,
+                            &rclPaint,
+                            0,
+                            0,
+                            DT_CENTER | DT_VCENTER | DT_TEXTATTRS);
+
+                free(pszText);
+            }
+
+            WinEndPaint(hps);
+        }
+        break;
+
+        case WM_PRESPARAMCHANGED:
+            switch ((ULONG)mp1)
+            {
+                case PP_BACKGROUNDCOLOR:
+                    WinInvalidateRect(hwndStatic,
+                                      NULL,
+                                      FALSE);
+                    // notify owner; since the static control
+                    // doesn't send any notifications, we
+                    // use EN_CHANGED
+                    WinSendMsg(WinQueryWindow(hwndStatic, QW_OWNER),
+                               WM_CONTROL,
+                               MPFROM2SHORT(WinQueryWindowUShort(hwndStatic, QWS_ID),
+                                            EN_CHANGE),
+                               (MPARAM)hwndStatic);
+                break;
+            }
+        break;
+
+        default:
+            mrc = G_pfnwpOrigStatic(hwndStatic, msg, mp1, mp2);
+        break;
+    }
+
+    return mrc;
+}
+
+/*
+ *@@ ctlMakeColorRect:
+ *      turns a static rectangle into a color rectangle.
+ *
+ *@@added V0.9.19 (2002-06-02) [umoeller]
+ */
+
+BOOL ctlMakeColorRect(HWND hwndStatic)
+{
+    PFNWP pfnwp;
+
+    if (pfnwp = WinSubclassWindow(hwndStatic,
+                                  ctl_fnwpSubclassedColorRect))
+    {
+        G_pfnwpOrigStatic = pfnwp;
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+

trunk/src/helpers/winh.c

@@ -3534 +3534 @@
     if (cbText)
     {
-        pszText = (PSZ)malloc(cbText + 1);
-        if (pszText)
+        if (pszText = (PSZ)malloc(cbText + 1))
             WinQueryWindowText(hwnd,
                                cbText + 1,