=================================================================== RCS file: /home/cvs/OpenXM_contrib2/windows/asir32gui/asir32guiview.cpp,v retrieving revision 1.11 retrieving revision 1.13 diff -u -p -r1.11 -r1.13 --- OpenXM_contrib2/windows/asir32gui/asir32guiview.cpp 2005/05/11 07:34:02 1.11 +++ OpenXM_contrib2/windows/asir32gui/asir32guiview.cpp 2005/10/02 01:34:43 1.13 @@ -370,6 +370,7 @@ void CAsir32guiView::OnChar(UINT nChar, UINT nRepCnt, { // TODO: この位置にメッセージ ハンドラ用のコードを追加するかまたはデフォルトの処理を呼び出してください char *exp_result; + char tmp[BUFSIZ]; if ( asirgui_kind == ASIRGUI_MESSAGE ) { Beep(); return; @@ -430,7 +431,8 @@ void CAsir32guiView::OnChar(UINT nChar, UINT nRepCnt, case CTRL('C'): send_intr(); /* wake up the engine */ - put_line(""); + tmp[0] = 0; + put_line(tmp); return; default : if ( nChar >= 0x20 && nChar < 0x7f ) @@ -494,7 +496,7 @@ void CAsir32guiView::OnAsirhelp() get_rootdir(root,sizeof(root),errmsg); sprintf(helpfile,"%s\\help\\asirhelp.chm",root); - HtmlHelp(NULL, helpfile, HH_DISPLAY_TOPIC, 0); + ::HtmlHelp(NULL, helpfile, HH_DISPLAY_TOPIC, 0); } void CAsir32guiView::OnFileLog() @@ -597,7 +599,7 @@ void CAsir32guiView::OnContribhelp() get_rootdir(root,sizeof(root),errmsg); sprintf(helpfile,"%s\\help\\cmanhelp.chm",root); - HtmlHelp(NULL, helpfile, HH_DISPLAY_TOPIC, 0); + ::HtmlHelp(NULL, helpfile, HH_DISPLAY_TOPIC, 0); } void CAsir32guiView::OnSize(UINT nType, int cx, int cy) @@ -615,7 +617,7 @@ void CAsir32guiView::OnDsolv() get_rootdir(root,sizeof(root),errmsg); sprintf(helpfile,"%s\\help\\dsolvhelp.chm",root); - HtmlHelp(NULL, helpfile, HH_DISPLAY_TOPIC, 0); + ::HtmlHelp(NULL, helpfile, HH_DISPLAY_TOPIC, 0); } void CAsir32guiView::OnGnuplot() @@ -625,7 +627,7 @@ void CAsir32guiView::OnGnuplot() get_rootdir(root,sizeof(root),errmsg); sprintf(helpfile,"%s\\help\\gnuplothelp.chm",root); - HtmlHelp(NULL, helpfile, HH_DISPLAY_TOPIC, 0); + ::HtmlHelp(NULL, helpfile, HH_DISPLAY_TOPIC, 0); } @@ -636,7 +638,7 @@ void CAsir32guiView::OnOkdiff() get_rootdir(root,sizeof(root),errmsg); sprintf(helpfile,"%s\\help\\ok_diffhelp.chm",root); - HtmlHelp(NULL, helpfile, HH_DISPLAY_TOPIC, 0); + ::HtmlHelp(NULL, helpfile, HH_DISPLAY_TOPIC, 0); } @@ -647,7 +649,7 @@ void CAsir32guiView::OnOkdmodule() get_rootdir(root,sizeof(root),errmsg); sprintf(helpfile,"%s\\help\\ok_dmodulehelp.chm",root); - HtmlHelp(NULL, helpfile, HH_DISPLAY_TOPIC, 0); + ::HtmlHelp(NULL, helpfile, HH_DISPLAY_TOPIC, 0); } @@ -658,7 +660,7 @@ void CAsir32guiView::OnOm() get_rootdir(root,sizeof(root),errmsg); sprintf(helpfile,"%s\\help\\omhelp.chm",root); - HtmlHelp(NULL, helpfile, HH_DISPLAY_TOPIC, 0); + ::HtmlHelp(NULL, helpfile, HH_DISPLAY_TOPIC, 0); } @@ -669,7 +671,7 @@ void CAsir32guiView::OnPfpcoh() get_rootdir(root,sizeof(root),errmsg); sprintf(helpfile,"%s\\help\\pfpcohhelp.chm",root); - HtmlHelp(NULL, helpfile, HH_DISPLAY_TOPIC, 0); + ::HtmlHelp(NULL, helpfile, HH_DISPLAY_TOPIC, 0); } @@ -680,7 +682,7 @@ void CAsir32guiView::OnPlucker() get_rootdir(root,sizeof(root),errmsg); sprintf(helpfile,"%s\\help\\pluckerhelp.chm",root); - HtmlHelp(NULL, helpfile, HH_DISPLAY_TOPIC, 0); + ::HtmlHelp(NULL, helpfile, HH_DISPLAY_TOPIC, 0); } @@ -691,7 +693,7 @@ void CAsir32guiView::OnSm1() get_rootdir(root,sizeof(root),errmsg); sprintf(helpfile,"%s\\help\\sm1help.chm",root); - HtmlHelp(NULL, helpfile, HH_DISPLAY_TOPIC, 0); + ::HtmlHelp(NULL, helpfile, HH_DISPLAY_TOPIC, 0); } @@ -702,7 +704,7 @@ void CAsir32guiView::OnTigers() get_rootdir(root,sizeof(root),errmsg); sprintf(helpfile,"%s\\help\\tigershelp.chm",root); - HtmlHelp(NULL, helpfile, HH_DISPLAY_TOPIC, 0); + ::HtmlHelp(NULL, helpfile, HH_DISPLAY_TOPIC, 0); } @@ -713,6 +715,6 @@ void CAsir32guiView::OnTodoparametrize() get_rootdir(root,sizeof(root),errmsg); sprintf(helpfile,"%s\\help\\todo_parametrizehelp.chm",root); - HtmlHelp(NULL, helpfile, HH_DISPLAY_TOPIC, 0); + ::HtmlHelp(NULL, helpfile, HH_DISPLAY_TOPIC, 0); }