===================================================================
RCS file: /home/cvs/OpenXM_contrib2/windows/engine2000/MainFrm.cpp,v
retrieving revision 1.4
retrieving revision 1.6
diff -u -p -r1.4 -r1.6
--- OpenXM_contrib2/windows/engine2000/MainFrm.cpp	2014/03/25 20:10:51	1.4
+++ OpenXM_contrib2/windows/engine2000/MainFrm.cpp	2015/08/20 17:47:53	1.6
@@ -3,15 +3,13 @@
 
 #include "stdafx.h"
 #include "ox_plot.h"
-
 #include "MainFrm.h"
 
-#include "gmpxx.h"
 extern "C" {
-#include "ca.h"
-#include "ifplot.h"
+#include "if_canvas.h"   
 }
 
+
 #ifdef _DEBUG
 #define new DEBUG_NEW
 #undef THIS_FILE
@@ -162,14 +160,11 @@ void CMainFrame::OnUpdateProgress(CCmdUI *pCmdUI)
 
 	if ( !m_wndView.can )
 		return;
-	switch ( mode = m_wndView.can->mode ) {
-		case MODE_IFPLOT: case MODE_CONPLOT:
+
+	if ( canvas_is_ifplot(m_wndView.can) ) {
 			pCmdUI->Enable();
-			strProgress.Format("%s%d%%",m_wndView.can->prefix,m_wndView.can->percentage);
+			strProgress.Format("%s%d%%",canvas_prefix(m_wndView.can),canvas_percentage(m_wndView.can));
 			pCmdUI->SetText(strProgress);
-			break;
-		default:
-			break;
 	}
 }