From 6d106eb1bb92dc235bcbda976ae232729bf52c7c Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期一, 25 十一月 2024 13:46:15 +0800
Subject: [PATCH] 合并代码
---
SourceCode/Bond/BondEq/CPanelProject.cpp | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/BondEq/CPanelProject.cpp b/SourceCode/Bond/BondEq/CPanelProject.cpp
index 92cf9e9..0aa4518 100644
--- a/SourceCode/Bond/BondEq/CPanelProject.cpp
+++ b/SourceCode/Bond/BondEq/CPanelProject.cpp
@@ -19,6 +19,7 @@
m_nPanelWidth = int((double)GetSystemMetrics(SM_CXSCREEN) * 0.25);
m_pAccordionWnd = nullptr;
m_pPageRemoteEqs = nullptr;
+ m_pPageComponents = nullptr;
}
CPanelProject::~CPanelProject()
@@ -75,6 +76,10 @@
m_pPageRemoteEqs->ShowWindow(SW_SHOW);
m_pAccordionWnd->AddItem("杩滅▼璁惧", m_pPageRemoteEqs, 0, TRUE, TRUE);
+ m_pPageComponents = new CProjectPageComponents();
+ m_pPageComponents->Create(IDD_PROJECT_PAGE_COMPONENTS, GetDlgItem(IDC_ACCORDION_WND1));
+ m_pPageComponents->ShowWindow(SW_SHOW);
+ m_pAccordionWnd->AddItem("缁勪欢鍒楄〃", m_pPageComponents, -1, TRUE, TRUE);
return TRUE; // return TRUE unless you set the focus to a control
// 寮傚父: OCX 灞炴�ч〉搴旇繑鍥� FALSE
@@ -110,6 +115,12 @@
::DeleteObject(m_hbrBkgnd);
}
+ if (m_pPageComponents != nullptr) {
+ m_pPageComponents->DestroyWindow();
+ delete m_pPageComponents;
+ m_pPageComponents = nullptr;
+ }
+
if (m_pPageRemoteEqs != nullptr) {
m_pPageRemoteEqs->DestroyWindow();
delete m_pPageRemoteEqs;
--
Gitblit v1.9.3