Changeset 243 for trunk/include/helpers/comctl.h

Timestamp:

Jan 29, 2003, 7:41:39 PM (23 years ago)

Author:

umoeller

Message:

New build system, multimedia, other misc fixes.

File:

• trunk/include/helpers/comctl.h (modified) (5 diffs)

trunk/include/helpers/comctl.h

@@ -52 +52 @@
 
     /*
-     *@@ SYSCOLORSET:
+     *@@ CCTLCOLOR:
      *
      *@@added V1.0.1 (2002-11-30) [umoeller]
      */
 
-    typedef struct _SYSCOLORSET
+    typedef struct _CCTLCOLOR
     {
         BOOL    fInheritPP;
-
-        LONG    lBackIndex,
-                lForeIndex;
-    } SYSCOLORSET, *PSYSCOLORSET;
+        ULONG   ulPP,
+                ulSysColor;
+    } CCTLCOLOR, *PCCTLCOLOR;
+
+    #define CTLCOL_BGND         0
+    #define CTLCOL_FGND         1
+
+    #define CCS_NOSENDCTLPTR            0x0001
 
     /*
@@ -77 +81 @@
 
         PFNWP       pDefWindowProc;
-        const SYSCOLORSET *pSysColorSet;
-
-        LONG        lcolBackground,
-                    lcolForeground;
+
+        ULONG       flCtl;              // CTL_* flags
 
         SIZEL       szlWin;             // current window dimensions
 
         PSZ         pszText;            // window text or NULL
+
+        const CCTLCOLOR *paCtlColors;
+        ULONG       cCtlColors;
+
+        PLONG       palColorValues;
 
     } DEFWINDATA, *PDEFWINDATA;
@@ -92 +99 @@
                     PDEFWINDATA pdwd,
                     PFNWP pDefWindowProc,
-                    const SYSCOLORSET *pSysColorSet);
+                    ULONG flCtl,
+                    const CCTLCOLOR *paCtlColors,
+                    ULONG cCtlColors);
 
     VOID ctlRefreshColors(PDEFWINDATA pdwd);
+
+    LONG ctlQueryColor(PDEFWINDATA pdwd, ULONG ulIndex);
 
     MRESULT ctlDefWindowProc(PDEFWINDATA pdwd, ULONG msg, MPARAM mp1, MPARAM mp2);
@@ -1005 +1016 @@
         HPOINTER    hptr;               // icon to paint or NULLHANDLE
 
-        // BOOL        fPaintButtonSunk;
-
     } XBUTTONDATA, *PXBUTTONDATA;
 
@@ -1410 +1419 @@
     #define WC_CCTL_CNR             "ComctlCnr"
 
+    typedef struct _CNRVIEWPORT
+    {
+        HWND        hwndCnr;
+        SIZEL       szlWorkarea,
+                    szlWin;
+        POINTL      ptlScroll;
+    } CNRVIEWPORT, *PCNRVIEWPORT;
+
+    #define CN_VIEWPORTCHANGED              159
+
     MRESULT EXPENTRY fnwpCnr(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);