浏览代码

1、InitialUpdateFrame不调用的话,CFormView关联的Ribbon界面不刷新;
解决办法:还是要在LoadFrame之后调用InitialUpdateFrame,但是参数2由原来的True改成False,这样就不会调用两次OnInitialUpdate。

scbc.sat2 5 年之前
父节点
当前提交
776e4ad08d

+ 2 - 1
SATHelper/SATHelper/DeviceView.cpp

@@ -434,7 +434,8 @@ void CDeviceView::OnPaint()
 	{
 		bLoad = mImage.Load(_T("bk.jpg")) == S_OK;
 	}
-	else
+	
+	if (bLoad)
 	{
 		// 缩放到最小后再拉大,区域为Null;
 		if (rc.IsRectEmpty() || rc.IsRectNull())

+ 8 - 8
SATHelper/SATHelper/MainFrm.cpp

@@ -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;

+ 2 - 2
SATHelper/SATHelper/SATHelper.cpp

@@ -112,10 +112,10 @@ BOOL CSATHelperApp::InitInstance()
 #endif
 
 #if 1
-	g_hMutex = ::CreateMutex(NULL, FALSE, _T("UB530"));
+	g_hMutex = ::CreateMutex(NULL, FALSE, _T("SATHelper"));
 	if (GetLastError() == ERROR_ALREADY_EXISTS)
 	{
-		::MessageBox(NULL, _T("UB530采集卡程序已经打开!"), _T("温馨提示"), MB_ICONINFORMATION);
+		::MessageBox(NULL, _T("SATHelper已经打开!"), _T("温馨提示"), MB_ICONINFORMATION);
 		return FALSE;
 	}
 

+ 1 - 0
SATHelper/SATHelper/SATHelper.vcxproj

@@ -78,6 +78,7 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\..\..\bin\$(ProjectName)\</OutDir>
     <IntDir>$(OutDir)$(Configuration)\</IntDir>
+    <TargetName>$(ProjectName)D</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>