Changeset 1364 for trunk/dll/mainwnd.c

Timestamp:

Dec 30, 2008, 3:54:32 PM (17 years ago)

Author:

Gregg Young

Message:

This should fix the black toolbar on install problem (Ticket 328)

File:

• trunk/dll/mainwnd.c (modified) (3 diffs)

trunk/dll/mainwnd.c

@@ -2604 +2604 @@
   case WM_CREATE:
     hwndToolback = hwnd;
-    RestorePresParams(hwnd, "ToolBar");
     break;
 
@@ -2626 +2625 @@
 
   case WM_PAINT:
-
-    PaintRecessedWindow(hwnd, (HPS)0, TRUE, FALSE);
-
     {
       HPS hps;
       RECTL rcl;
-      ULONG lColor = NULL;
+      ULONG lColor = 0L;
 
       hps = WinBeginPaint(hwnd, (HPS)0, NULL);
       if (hps) {
-        GpiCreateLogColorTable(hps, 0, LCOLF_RGB, 0, 0, NULL);
-        if (!(WinQueryPresParam(hwnd, PP_BACKGROUNDCOLOR, 0, NULL,
-                                sizeof(lColor), &lColor, 0)))
-          lColor = CLR_PALEGRAY;
+        GpiCreateLogColorTable(hps, 0, LCOLF_RGB, 0, 0, NULL);
+        if (!WinQueryPresParam(hwnd, PP_BACKGROUNDCOLOR, 0, NULL,
+                               sizeof(lColor), &lColor, 0))
+          lColor = 0x00CCCCCCL; //Palegray
         WinQueryWindowRect(hwnd, &rcl);
         WinFillRect(hps, &rcl, lColor);
@@ -2658 +2654 @@
       TOOL *tool;
 
+      RestorePresParams(hwnd, "ToolBar");
       id = SHORT1FROMMP(mp1);
       tool = find_tool(id);