Changeset 243 for trunk/src/helpers/cctl_toolbar.c

Timestamp:

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

Author:

umoeller

Message:

New build system, multimedia, other misc fixes.

File:

• trunk/src/helpers/cctl_toolbar.c (modified) (9 diffs)

trunk/src/helpers/cctl_toolbar.c

@@ -186 +186 @@
     LONG    lLeft,
             lRight,
-            lColorMiddle = pbd->dwd.lcolBackground;
+            lColorMiddle = ctlQueryColor(&pbd->dwd, CTLCOL_BGND); // pbd->dwd.lcolBackground;
     RECTL   rclWin,
             rclTemp;
@@ -344 +344 @@
        )
     {
-        GpiSetColor(hps, pbd->dwd.lcolForeground);
+        GpiSetColor(hps,
+                    ctlQueryColor(&pbd->dwd, CTLCOL_FGND)); // pbd->dwd.lcolForeground);
         rclTemp.yTop -= 2 * TBB_TEXTSPACING + lOfs;
         rclTemp.xRight += 2 * lOfs;     // twice the offset because we center horizontally
@@ -354 +355 @@
 }
 
-static const SYSCOLORSET G_scsToolbarButton =
+/* static const SYSCOLORSET G_scsToolbarButton =
     {
         TRUE,       // inherit presparams
@@ -360 +361 @@
         SYSCLR_BUTTONMIDDLE,
         SYSCLR_MENUTEXT
+    };
+*/
+
+static const CCTLCOLOR G_scsToolbarButton[] =
+    {
+        TRUE, PP_BACKGROUNDCOLOR, SYSCLR_BUTTONMIDDLE,
+        TRUE, PP_FOREGROUNDCOLOR, SYSCLR_MENUTEXT,
     };
 
@@ -445 +453 @@
                    &pData->bd.dwd,
                    WinDefWindowProc,
-                   &G_scsToolbarButton);
+                   0,
+                   G_scsToolbarButton,
+                   ARRAYITEMCOUNT(G_scsToolbarButton));
 
         if (    (pcszText)
@@ -851 +861 @@
  ********************************************************************/
 
-static const SYSCOLORSET G_scsToolbar =
-    {
-        TRUE,       // inherit presparams
-        SYSCLR_MENU,
-        SYSCLR_MENUTEXT
+static const CCTLCOLOR G_scsToolbar[] =
+    {
+        TRUE, PP_BACKGROUNDCOLOR, SYSCLR_MENU,
+        TRUE, PP_FOREGROUNDCOLOR, SYSCLR_MENUTEXT
     };
 
@@ -1017 +1026 @@
                            (PVOID)pcszFont);
 
-        lColor = winhQueryPresColor2(pData->dwd.hwnd,
-                                     PP_BACKGROUNDCOLOR,
-                                     PP_BACKGROUNDCOLORINDEX,
-                                     FALSE,
-                                     G_scsToolbar.lBackIndex);
+        lColor = ctlQueryColor(&pData->dwd, CTLCOL_BGND);
         winhStorePresParam(&ppp,
                            PP_BACKGROUNDCOLOR,
@@ -1027 +1032 @@
                            &lColor);
 
-        lColor = winhQueryPresColor2(pData->dwd.hwnd,
-                                     PP_FOREGROUNDCOLOR,
-                                     PP_FOREGROUNDCOLORINDEX,
-                                     FALSE,
-                                     G_scsToolbar.lForeIndex);
+        lColor = ctlQueryColor(&pData->dwd, CTLCOL_FGND);
         winhStorePresParam(&ppp,
                            PP_FOREGROUNDCOLOR,
@@ -1112 +1113 @@
                &pData->dwd,
                WinDefWindowProc,
-               &G_scsToolbar);
+               0,
+               G_scsToolbar,
+               ARRAYITEMCOUNT(G_scsToolbar));
 
     pData->hwndControlsOwner = ptbcd->hwndControlsOwner;