===================================================================
RCS file: /home/cvs/OpenXM_contrib2/windows/engine2000/ox_plot.cpp,v
retrieving revision 1.4
retrieving revision 1.6
diff -u -p -r1.4 -r1.6
--- OpenXM_contrib2/windows/engine2000/ox_plot.cpp	2002/10/02 09:33:32	1.4
+++ OpenXM_contrib2/windows/engine2000/ox_plot.cpp	2014/03/25 20:10:52	1.6
@@ -12,14 +12,16 @@
 static char THIS_FILE[] = __FILE__;
 #endif
 
+#include "gmpxx.h"
 extern "C" {
 #include "ca.h"
 #include "ifplot.h"
 
+	extern HANDLE hCanvasCreated;
+	extern HANDLE hMainThreadReady;
 	extern HANDLE hStreamNotify;
 	extern HANDLE hStreamNotify_Ack;
 	extern DWORD MainThread;
-	extern int canvas_created;
 	void Init_IO();
 }
 /////////////////////////////////////////////////////////////////////////////
@@ -86,6 +88,7 @@ BOOL COx_plotApp::InitInstance()
 		WS_OVERLAPPEDWINDOW | FWS_ADDTOTITLE, NULL, 
 		NULL);
 	MainThread = m_nThreadID;
+	SetEvent(hMainThreadReady);
 
 	// メイン ウィンドウが初期化されたので、表示と更新を行います。
 //	pFrame->ShowWindow(SW_SHOW);
@@ -184,12 +187,11 @@ BOOL COx_plotApp::PreTranslateMessage(MSG* pMsg) 
 			pFrame->UpdateWindow();
 			pFrame->BringWindowToTop();
 			can->hwnd = pFrame->m_wndView.m_hWnd;
-			canvas_created = 1;
 		} else
 			pFrame = (CMainFrame *)can->window;
 		pFrame->RedrawWindow();
-	} else if ( pMsg->message == WM_APP+1 )
-		;  // dummy message
+		SetEvent(hCanvasCreated);
+	} 
 	return CWinApp::PreTranslateMessage(pMsg);
 }