Changeset 926

Timestamp:

Jan 17, 2008, 2:53:52 AM (18 years ago)

Author:

Gregg Young

Message:

Background color on toolbar now can be change with drag drop; ticket 161. Set command line string length to 2048

Location:

trunk/dll

Files:

• fm3dll.h (modified) (1 diff)
• init.c (modified) (1 diff)
• mainwnd.c (modified) (2 diffs)

trunk/dll/fm3dll.h

@@ -685 +685 @@
 HAPP Exec(HWND hwndNotify, BOOL child, char *startdir, char *env,
           PROGTYPE * progt, ULONG fl, char *formatstring, ...);
-#define MAXCOMLINESTRG (4096)                   /* used to build command line strings */
+#define MAXCOMLINESTRG (2048)                   /* used to build command line strings */
 #define RUNTYPE_MASK  0xf
 #define SYNCHRONOUS   1

trunk/dll/init.c

@@ -830 +830 @@
   WinRegisterClass(hab,
                    WC_TOOLBACK,
-                   ToolBackProc, CS_SIZEREDRAW, sizeof(PVOID));
+                   ToolBackProc,
+                   CS_SYNCPAINT | CS_SIZEREDRAW | CS_PARENTCLIP,
+                   sizeof(PVOID));
   WinRegisterClass(hab,
                    WC_DRIVEBACK,

trunk/dll/mainwnd.c

@@ -2467 +2467 @@
   case WM_CREATE:
     hwndToolback = hwnd;
-    SetPresParams(hwnd,
-                  &RGBGREY, &RGBBLACK, &RGBGREY, GetPString(IDS_8HELVTEXT));
+    RestorePresParams(hwnd, "ToolBar");
     break;
 
@@ -2490 +2489 @@
 
   case WM_PAINT:
+
+    PaintRecessedWindow(hwnd, (HPS)0, TRUE, FALSE);
+
     {
       HPS hps;
       RECTL rcl;
-
-      hps = WinBeginPaint(hwnd, (HPS) 0, NULL);
+      ULONG lColor;
+
+      hps = WinBeginPaint(hwnd, (HPS)0, NULL);
       if (hps) {
-        WinQueryWindowRect(hwnd, &rcl);
-        WinFillRect(hps, &rcl, CLR_PALEGRAY);
-        WinEndPaint(hps);
-      }
-      PaintRecessedWindow(hwnd, (HPS) 0, TRUE, FALSE);
-    }
+        GpiCreateLogColorTable(hps, 0, LCOLF_RGB, 0, 0, NULL);
+        WinQueryPresParam(hwnd,              /* Window handle         */
+                          PP_BACKGROUNDCOLOR,  /* Background presparam  */
+                          0,
+                          NULL,
+                          sizeof(lColor),      /* Length of data buffer */
+                          &lColor,             /* Data buffer returned  */
+                          0);
+        WinQueryWindowRect(hwnd, &rcl);
+        WinFillRect(hps, &rcl, lColor);
+        WinEndPaint(hps);
+      }
+
+    }
+    break;
+
+  case WM_PRESPARAMCHANGED:
+    PresParamChanged(hwnd, "ToolBar", mp1, mp2);
+    WinInvalidateRect(hwnd, NULL, TRUE);
     break;