=================================================================== RCS file: /home/cvs/OpenXM_contrib2/windows/asir32gui/MainFrm.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- OpenXM_contrib2/windows/asir32gui/MainFrm.cpp 2000/11/22 06:14:29 1.1 +++ OpenXM_contrib2/windows/asir32gui/MainFrm.cpp 2000/12/15 07:55:02 1.2 @@ -50,7 +50,7 @@ CMainFrame::~CMainFrame() } extern "C" { - extern int asir_main_window; + extern int asirgui_kind; } int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct) @@ -58,7 +58,7 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct if (CFrameWnd::OnCreate(lpCreateStruct) == -1) return -1; - if ( asir_main_window ) { + if ( asirgui_kind == ASIRGUI_MAIN ) { if (!m_wndToolBar.Create(this) || !m_wndToolBar.LoadToolBar(IDR_MAINFRAME)) { @@ -91,7 +91,7 @@ BOOL CMainFrame::PreCreateWindow(CREATESTRUCT& cs) { // TODO: この位置で CREATESTRUCT cs を修正して、Window クラスやスタイルを // 修正してください。 - if ( asir_main_window ) { + if ( asirgui_kind == ASIRGUI_MAIN ) { cs.cx = ::GetSystemMetrics(SM_CXSCREEN)*2 / 3; cs.cy = ::GetSystemMetrics(SM_CYSCREEN)*2 / 3; } else {