===================================================================
RCS file: /home/cvs/OpenXM_contrib/gnuplot/win/Attic/wgraph.c,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.3
diff -u -p -r1.1.1.1 -r1.1.1.3
--- OpenXM_contrib/gnuplot/win/Attic/wgraph.c	2000/01/09 17:01:19	1.1.1.1
+++ OpenXM_contrib/gnuplot/win/Attic/wgraph.c	2003/09/15 07:09:40	1.1.1.3
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: wgraph.c,v 1.1.1.1 2000/01/09 17:01:19 maekawa Exp $";
+static char *RCSid = "$Id: wgraph.c,v 1.1.1.3 2003/09/15 07:09:40 ohara Exp $";
 #endif
 
 /* GNUPLOT - win/wgraph.c */
@@ -366,6 +366,7 @@ MakePens(LPGW lpgw, HDC hdc)
 		for (i=0; i<WGNUMPENS; i++)
 		{
 			lpgw->hpen[i] = CreatePenIndirect((LOGPEN FAR *)&lpgw->monopen[i+2]);
+            		lpgw->hsolidpen[i] = CreatePenIndirect((LOGPEN FAR *)&lpgw->monopen[2]);
 			}
 		/* find number of solid, unit width line styles */
 		for (i=0; i<WGNUMPENS && lpgw->monopen[i+2].lopnStyle==PS_SOLID
@@ -384,6 +385,9 @@ MakePens(LPGW lpgw, HDC hdc)
 		for (i=0; i<WGNUMPENS; i++)
 		{
 			lpgw->hpen[i] = CreatePenIndirect((LOGPEN FAR *)&lpgw->colorpen[i+2]);
+#if 1 /* HBB 980118 fix 'numsolid' problem */
+			lpgw->hsolidpen[i] = CreatePen(PS_SOLID, 1, lpgw->colorpen[i+2].lopnColor);
+#endif
 			}
 		/* find number of solid, unit width line styles */
 		for (i=0; i<WGNUMPENS && lpgw->colorpen[i+2].lopnStyle==PS_SOLID
@@ -405,6 +409,10 @@ DestroyPens(LPGW lpgw)
 	DeleteObject(lpgw->hapen);
 	for (i=0; i<WGNUMPENS; i++)
 		DeleteObject(lpgw->hpen[i]);
+#if 1 /* HBB 980118: fix 'numsolid' gotcha */
+	for (i=0; i<WGNUMPENS; i++)
+		DeleteObject(lpgw->hsolidpen[i]);
+#endif
 	for (i=0; i<WGNUMPENS+2; i++)
 		DeleteObject(lpgw->colorbrush[i]);
 }
@@ -732,11 +740,15 @@ drawgraph(LPGW lpgw, HDC hdc, LPRECT rect)
 				}
 				break;
 			default:	/* A plot mark */
+#if 0 /* HBB 980118: fix 'sumsolid' gotcha: */
 				if (pen >= numsolid) {
 					pen %= numsolid;	/* select solid pen */
 					SelectObject(hdc, lpgw->hpen[pen]);
 					SelectObject(hdc, lpgw->colorbrush[pen+2]);
 				}
+#else
+                                SelectObject(hdc, lpgw->hsolidpen[pen%WGNUMPENS]);
+#endif
                                 switch (curptr->op) {
 					case W_dot:
 						dot(hdc, xdash, ydash);