|
@@ -284,8 +284,8 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
|
|
|
if (m_pUB530View->LoadFrame(DLG_UB530VIEW, WS_MAXIMIZE | WS_OVERLAPPEDWINDOW /*WS_CHILDWINDOW*/, this, &context))
|
|
|
{
|
|
|
//m_pUB530View->ShowWindow(SW_SHOWMAXIMIZED);
|
|
|
- m_pUB530View->InitialUpdateFrame(context.m_pCurrentDoc, TRUE);
|
|
|
- m_pUB530View->MDIActivate();
|
|
|
+ m_pUB530View->InitialUpdateFrame(context.m_pCurrentDoc, FALSE);
|
|
|
+ //m_pUB530View->MDIActivate();
|
|
|
}
|
|
|
#else
|
|
|
CCreateContext context;
|
|
@@ -303,7 +303,7 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
|
|
|
}
|
|
|
#endif
|
|
|
|
|
|
-#if 2 // 第二个视图;
|
|
|
+#if 1 // 第二个视图;
|
|
|
CCreateContext context2;
|
|
|
m_pDeviceView = new CChildFrame();
|
|
|
context2.m_pLastView = NULL;
|
|
@@ -315,13 +315,15 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
|
|
|
if (m_pDeviceView->LoadFrame(DLG_DEVICEMANAGER, WS_MAXIMIZE | WS_CHILDWINDOW| WS_OVERLAPPEDWINDOW, this, &context2))
|
|
|
{
|
|
|
//m_pDeviceView->ShowWindow(SW_SHOWMAXIMIZED);
|
|
|
- //m_pDeviceView->InitialUpdateFrame(NULL, TRUE);
|
|
|
- //m_pDeviceView->MDIActivate();
|
|
|
+ m_pDeviceView->InitialUpdateFrame(NULL, FALSE);
|
|
|
+ m_pDeviceView->MDIActivate();
|
|
|
}
|
|
|
+#else
|
|
|
+
|
|
|
#endif
|
|
|
|
|
|
m_pUB530View->MDIActivate();
|
|
|
- //m_pUB530View->ShowWindow(SW_SHOWMAXIMIZED);
|
|
|
+ m_pUB530View->ShowWindow(SW_SHOWMAXIMIZED);
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
@@ -342,8 +344,6 @@ BOOL CMainFrame::PreCreateWindow(CREATESTRUCT& cs)
|
|
|
#if __DOCKINGBAR__
|
|
|
BOOL CMainFrame::CreateDockingWindows()
|
|
|
{
|
|
|
- BOOL bNameValid;
|
|
|
-
|
|
|
#if __FC_WIN__
|
|
|
// 创建类视图
|
|
|
CString strClassView;
|