===================================================================
RCS file: /home/cvs/OpenXM_contrib2/windows/engine2000/ChildView.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- OpenXM_contrib2/windows/engine2000/ChildView.cpp	2014/03/25 20:10:51	1.4
+++ OpenXM_contrib2/windows/engine2000/ChildView.cpp	2014/05/13 20:07:23	1.5
@@ -81,7 +81,7 @@ void CChildView::OnPaint() 
 	// TODO: メッセージ ハンドラのコードをここに追加してください。
 	
 	// 描画のために CWnd::OnPaint を呼び出してはいけません。
-	if ( can->mode == MODE_INTERACTIVE ) {
+	if ( can->mode == modeNO(INTERACTIVE) ) {
 		::BitBlt(dc.m_hDC,0,0,can->width,can->height,can->pix,0,0,SRCCOPY);
 	} else {
 		if ( !can->wide ) {
@@ -123,7 +123,7 @@ void CChildView::OnPrint(CDC &dc) 
 	dc.StartDoc(&docinfo);
 	dc.StartPage();
 
-	if ( can->mode == MODE_INTERACTIVE ) {
+	if ( can->mode == modeNO(INTERACTIVE) ) {
 
 		// We want to associate a rectangle of a fixed size to
 		// one bitmap pixel
@@ -164,7 +164,7 @@ void CChildView::OnPrint(CDC &dc) 
 		dc.SetViewportOrg(width/18,height/18);
 		dc.SetViewportExt(width,height);
 
-		if ( can->mode == MODE_PLOT )
+		if ( can->mode == modeNO(PLOT) )
 			dc.Polyline(can->pa[0].pos,can->pa[0].length);
 		else
 		::StretchBlt(dc.m_hDC,0,0,can->width,can->height,can->pix,
@@ -184,9 +184,9 @@ void CChildView::PrintAxis(CDC &dc)
 	char buf[BUFSIZ];
 
 	/* XXX : should be cleaned up */
-	if ( can->noaxis || (can->mode == MODE_PLOT && !can->pa) )
+	if ( can->noaxis || (can->mode == modeNO(PLOT) && !can->pa) )
 		return;
-	if ( can->mode == MODE_INTERACTIVE )
+	if ( can->mode == modeNO(INTERACTIVE) )
 		return;
 
 	xadj = yadj = 0;