From e8a27bb203fe2aff70390a5eca002d7438da9b0f Mon Sep 17 00:00:00 2001 From: mrDarker <mr.darker@163.com> Date: 星期三, 22 十月 2025 14:24:34 +0800 Subject: [PATCH] Merge branch 'clh' into liuyang --- SourceCode/Bond/BondEq/TopToolbar.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/SourceCode/Bond/BondEq/TopToolbar.h b/SourceCode/Bond/BondEq/TopToolbar.h index 8b33d3e..1228bbb 100644 --- a/SourceCode/Bond/BondEq/TopToolbar.h +++ b/SourceCode/Bond/BondEq/TopToolbar.h @@ -18,6 +18,7 @@ public: CWnd* GetBtn(UINT nId); void SetOperatorBtnText(const char* pszText); + HMENU GetOperatorMenu(); private: void Resize(); @@ -31,6 +32,7 @@ private: CBlButton m_btnRun; CBlButton m_btnStop; + CBlButton m_btnAlarm; CBlButton m_btnSettings; CBlButton m_btnOperator; @@ -51,4 +53,5 @@ afx_msg void OnSize(UINT nType, int cx, int cy); virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam); afx_msg void OnButtonOperatorMenuClicked(NMHDR* pNMHDR, LRESULT* pResult); + virtual BOOL PreTranslateMessage(MSG* pMsg); }; -- Gitblit v1.9.3