=================================================================== RCS file: /home/cvs/OpenXM_contrib/gnuplot/win/Attic/wgnuplib.h,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.2 diff -u -p -r1.1.1.1 -r1.1.1.2 --- OpenXM_contrib/gnuplot/win/Attic/wgnuplib.h 2000/01/09 17:01:18 1.1.1.1 +++ OpenXM_contrib/gnuplot/win/Attic/wgnuplib.h 2000/01/22 14:16:31 1.1.1.2 @@ -1,5 +1,5 @@ /* - * $Id: wgnuplib.h,v 1.1.1.1 2000/01/09 17:01:18 maekawa Exp $ + * $Id: wgnuplib.h,v 1.1.1.2 2000/01/22 14:16:31 maekawa Exp $ */ /* GNUPLOT - win/wgnuplib.h */ @@ -53,7 +53,11 @@ #define _Windows #endif -#ifdef __DLL__ +/* HBB 19990506: The following used to be #ifdef __DLL__. + * But _export is needed outside the DLL, as well. The long-standing + * bug crashing 16bit wgnuplot on Alt-F4 or pressing the 'close' button + * stemmed here. */ +#ifndef WIN32 #define WINEXPORT _export #else #define WINEXPORT @@ -320,6 +324,9 @@ typedef struct tagGW { HPEN hbpen; /* border pen */ HPEN hapen; /* axis pen */ HPEN hpen[WGNUMPENS]; /* pens */ +#if 1 /* HBB 980118: new try ... */ + HPEN hsolidpen[WGNUMPENS]; /* solid pens (for point symbols) */ +#endif LOGPEN colorpen[WGNUMPENS+2]; /* logical color pens */ LOGPEN monopen[WGNUMPENS+2]; /* logical mono pens */ COLORREF background; /* background color */