===================================================================
RCS file: /home/cvs/OpenXM_contrib2/windows/engine2000/MainFrm.cpp,v
retrieving revision 1.2
retrieving revision 1.5
diff -u -p -r1.2 -r1.5
--- OpenXM_contrib2/windows/engine2000/MainFrm.cpp	2002/07/30 03:06:20	1.2
+++ OpenXM_contrib2/windows/engine2000/MainFrm.cpp	2014/05/13 20:07:23	1.5
@@ -6,6 +6,7 @@
 
 #include "MainFrm.h"
 
+#include "gmpxx.h"
 extern "C" {
 #include "ca.h"
 #include "ifplot.h"
@@ -145,7 +146,7 @@ void CMainFrame::OnClose() 
 {
 	// TODO: この位置にメッセージ ハンドラ用のコードを追加するかまたはデフォルトの処理を呼び出してください
 	m_wndView.DestroyCanvas();	
-//	CFrameWnd::OnClose();
+	CFrameWnd::OnClose();
 }
 
 void CMainFrame::OnAppExit() 
@@ -161,14 +162,12 @@ void CMainFrame::OnUpdateProgress(CCmdUI *pCmdUI)
 
 	if ( !m_wndView.can )
 		return;
-	switch ( mode = m_wndView.can->mode ) {
-		case MODE_IFPLOT: case MODE_CONPLOT:
+
+	mode = m_wndView.can->mode;
+	if (mode == modeNO(IFPLOT) || mode == modeNO(CONPLOT)) {
 			pCmdUI->Enable();
 			strProgress.Format("%s%d%%",m_wndView.can->prefix,m_wndView.can->percentage);
 			pCmdUI->SetText(strProgress);
-			break;
-		default:
-			break;
 	}
 }