From f5c4a7f3bce165fe2c8c6d934f0f49a363a2ea60 Mon Sep 17 00:00:00 2001 From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com> Date: 星期五, 15 十一月 2024 09:19:31 +0800 Subject: [PATCH] Merge branch 'master' into liuyang --- SourceCode/Bond/BondEq/BondEqDlg.cpp | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/SourceCode/Bond/BondEq/BondEqDlg.cpp b/SourceCode/Bond/BondEq/BondEqDlg.cpp index eb1cde7..21935a5 100644 --- a/SourceCode/Bond/BondEq/BondEqDlg.cpp +++ b/SourceCode/Bond/BondEq/BondEqDlg.cpp @@ -7,7 +7,7 @@ #include "BondEqDlg.h" #include "afxdialogex.h" #include "Common.h" -#include "Bonder.h" +#include "CBonder.h" #include "SettingsDlg.h" #include "UserManager.h" #include "LoginDlg.h" @@ -198,6 +198,9 @@ m_pTopToolbar->Create(IDD_TOP_TOOLBAR, this); m_pTopToolbar->ShowWindow(SW_SHOW); m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(FALSE); + HMENU hMenu = m_pTopToolbar->GetOperatorMenu(); + ASSERT(hMenu); + ::EnableMenuItem(hMenu, ID_OPEATOR_SWITCH, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED); // 设备面板 -- Gitblit v1.9.3