Changeset 39

Timestamp:

01/20/08 13:24:00 (11 months ago)

Author:

cinc

Message:

Use default window color in info area instead of white when no presentation parameters are set.

Location:

trunk/helper

Files:

• folderinfownd.c (modified) (5 diffs)
• ft2lib-htmlwnd.c (modified) (2 diffs)
• htmlwnd.c (modified) (1 diff)

trunk/helper/folderinfownd.c

@@ +1 @@
+/*
+  (c) Chris Wohlgemuth 1996/2008
+
+  This file is copyrighted.
+
+  For licensing contact cinc-ml@netlabs.org
+
+  No use or copying without prior permission.
+*/
+
 #define INCL_WINWORKPLACE
 #define INCL_WIN
@@ -67 +77 @@
               ULONG fl=0;
               BOOL rc;
-              PPAINTCTXT pPaintCtxt;
 
 #if 0
+              PPAINTCTXT pPaintCtxt_;
               if(!CWThemeMgrObject)
                 break;
@@ -88 +98 @@
               oi.idItem=CMA_ICON;
               oi.hItem=(ULONG)&cdii;
-                           
+     
+              /* The draw emphasis call is only to get the paintcontext filled with the
+               background color. May go away when cairo 1.4.7 is used. */
               rc=_wizDrawIconEmphasis(pWCtlData->wpObject, &oi, 30, fl);
               rc=_wizDrawIcon(pWCtlData->wpObject, &oi, 30, fl);
@@ -154 +166 @@
         }
         else
-          WinFillRect(hps, &rcl, 0x00FFFFFF);
+          WinFillRect(hps, &rcl, SYSCLR_WINDOW /* 0x00FFFFFF*/ );
         
         /* Paint preview here */
@@ -227 +239 @@
           lBg=(bg.bRed<<16)+(bg.bGreen<<8) + bg.bBlue;
           /* Set it */
-          //HlpWriteToTrapLog("0x%x %x %x %x %d\n", lBg, bg.bRed, bg.bGreen, bg.bBlue, attrFound);
           WinFillRect(hps, &rcl, (LONG) lBg);
         }
         else
-          WinFillRect(hps, &rcl, 0x00FFFFFF);
+          WinFillRect(hps, &rcl, SYSCLR_WINDOW /* 0x00FFFFFF*/ );
 
         drawIcon(hwnd, hps, rcl);

trunk/helper/ft2lib-htmlwnd.c

@@ +1 @@
+/*
+  (c) Chris Wohlgemuth 1996/2008
+
+  This file is copyrighted.
+
+  For licensing contact cinc-ml@netlabs.org
+
+  No use without prior permission.
+*/
+
 #define INCL_WINWORKPLACE
 #define INCL_WIN
@@ -1619 +1629 @@
 #endif
         else
-          WinFillRect(hps, &rcl, 0x00FFFFFF);
+          WinFillRect(hps, &rcl, SYSCLR_WINDOW /* 0x00FFFFFF*/ );
 
         drawItNow(hwnd, hps, &rcl, 0, 0);

trunk/helper/htmlwnd.c

@@ -1616 +1616 @@
 #endif
         else
-          WinFillRect(hps, &rcl, 0x00FFFFFF);
+          WinFillRect(hps, &rcl, SYSCLR_WINDOW /* 0x00FFFFFF*/ );
         
         drawItNow(hwnd, hps, &rcl, 0, 0);