===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/ifplot.h,v
retrieving revision 1.17
retrieving revision 1.24
diff -u -p -r1.17 -r1.24
--- OpenXM_contrib2/asir2000/plot/ifplot.h	2014/05/12 16:54:41	1.17
+++ OpenXM_contrib2/asir2000/plot/ifplot.h	2015/08/14 13:51:56	1.24
@@ -45,9 +45,9 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/plot/ifplot.h,v 1.16 2014/03/25 19:24:43 ohara Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/plot/ifplot.h,v 1.23 2015/08/06 10:01:53 fujimoto Exp $ 
 */
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 /* for Visual C++ */
 #include <windows.h>
 #else
@@ -97,6 +97,7 @@
 #define PLOT "plot"
 #define INTERACTIVE "interactive"
 #define POLARPLOT "polarplot"
+#define POLARPLOTD "polarplotD"
 #define PLOTOVER "plotover"
 #define IFPLOTD "ifplotD"
 #define IFPLOTQ "ifplotQ"
@@ -130,7 +131,7 @@
 #define ARRAYPLOT "arrayplot"
 #define OPEN_CANVAS "open_canvas"
 #define DRAWCIRCLE "drawcircle"
-#define DRAW_OBJ "draw_objc"
+#define DRAW_OBJ "draw_obj"
 #define DRAW_STRING "draw_string"
 #define OBJ_CP "obj_cp"
 #define CLEAR_CANVAS "clear_canvas"
@@ -174,13 +175,14 @@
 #define DRAW_STRING 35
 #define OBJ_CP 36
 #define CLEAR_CANVAS 37
+#define POLARPLOTD 38
 */
 
 #define DIR_X 0
 #define DIR_Y 1
 #define DIR_Z 2
 
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 /* for Visual C++ */
 #define XC(a) ((a).x)
 #define YC(a) ((a).y)
@@ -239,7 +241,7 @@ typedef struct RealVect {
 
 struct canvas {
 	int index;
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 /* for Visual C++ */
 	void *window; /* pointer to CMainFrame */
 	HWND hwnd; /* handle to the canvas window */
@@ -253,7 +255,7 @@ struct canvas {
 	Pixmap pix;
 #endif
 	char *wname;
-	char mode;
+	int mode;
 	char wide;
 	char precise;
 	char noaxis;
@@ -270,7 +272,7 @@ struct canvas {
 	struct pa *pa;
 	/* to register the history in the interactive mode */
 	NODE history;
-	int color;
+	unsigned int color;
 	int division;
 };
 
@@ -280,7 +282,6 @@ extern struct canvas *current_can;
 extern char* pfn[];
 
 #if defined(INTERVAL)
-extern Pixel BackPixel;
 extern int Itvplot;
 #endif
 
@@ -290,7 +291,7 @@ extern int stream;
 extern DISPLAY *display;
 extern CURSOR normalcur,runningcur,errorcur;
 
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 extern POINT start_point,end_point;
 extern SIZE cansize;
 #else
@@ -313,13 +314,14 @@ void qcalc(char **,struct canvas *);
 void calcb(double **,struct canvas *,int);
 void calcq(double **,struct canvas *,int);
 void polarcalc(struct canvas *);
+void polarcalcNG(struct canvas *);
 void sturmseq(VL,P,VECT *);
 void seproot(VECT,int,int,int *);
 int numch(VECT,Q,Q);
 void usubstqp(P,Q,Q *);
 void plotcalc(struct canvas *);
 int open_canvas(NODE);
-int plot(NODE,char *);
+int plot(NODE,int);
 int ifplotold(NODE);
 int polarplot(NODE);
 int conplotD(NODE);
@@ -346,7 +348,7 @@ void area_print(DISPLAY *,double **, struct canvas *, 
 void memory_print(struct canvas *,BYTEARRAY *);
 void over_print(DISPLAY *,double **,struct canvas *,int);
 void polar_print(DISPLAY *,struct canvas *);
-unsigned long GetColor(Display *,char *);
+unsigned long GetColor(DISPLAY *,char *);
 void Pox_pop_local(NODE,Obj *);
 void Pox_pop_cmo(NODE,Obj *);
 
@@ -365,21 +367,20 @@ void itvplotmain1(struct canvas *);
 #endif
 void ifplot_resize(struct canvas *,POINT,POINT);
 void plot_resize(struct canvas *,POINT,POINT);
-void ifplotmainOld(struct canvas *);
 void ifplotmain(struct canvas *);
-void ifplotmains(struct canvas *);
+void ifplotmainNG(struct canvas *);
 void qifplotmain(struct canvas *);
-void if_print(DISPLAY *,double **,struct canvas *,int);
-void if_printOld(DISPLAY *,double **,struct canvas *);
+void if_printNG(DISPLAY *,double **,struct canvas *,int);
+void if_print(DISPLAY *,double **,struct canvas *);
 void memory_if_print(double **,struct canvas *,BYTEARRAY *);
 void con_print(DISPLAY *,double **,struct canvas *);
 void memory_con_print(double **,struct canvas *,BYTEARRAY *);
 void qif_print(DISPLAY *,char **,struct canvas *);
 void plot_print(DISPLAY *,struct canvas *);
 void set_drawcolor(unsigned int);
-void draw_character_string(DISPLAY *,struct canvas *,int,int,char *,int);
-void draw_point(DISPLAY *,struct canvas *,int,int,int);
-void draw_line(DISPLAY *,struct canvas *,int,int,int,int,int);
+void draw_character_string(DISPLAY *,struct canvas *,int,int,char *,unsigned int);
+void draw_point(DISPLAY *,struct canvas *,int,int,unsigned int);
+void draw_line(DISPLAY *,struct canvas *,int,int,int,int,unsigned int);
 void pline(DISPLAY *,struct canvas *,DRAWABLE);
 double adjust_scale(double,double);
 void initmarker(struct canvas *,char *);
@@ -401,7 +402,7 @@ int init_plot_display(int,char **);
 void reset_current_computation();
 void process_xevent();
 
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 int search_active_canvas();
 void destroy_canvas(struct canvas *can);
 void draw_wideframe(struct canvas *can,DRAWABLE d);