From 405bd36e812c3645e8d9d84700777e2eaeb036ec Mon Sep 17 00:00:00 2001 From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com> Date: 星期五, 30 五月 2025 16:18:17 +0800 Subject: [PATCH] Merge branch 'clh' --- SourceCode/Bond/Servo/ServoDlg.h | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/SourceCode/Bond/Servo/ServoDlg.h b/SourceCode/Bond/Servo/ServoDlg.h index f78d8c5..a281b1c 100644 --- a/SourceCode/Bond/Servo/ServoDlg.h +++ b/SourceCode/Bond/Servo/ServoDlg.h @@ -13,6 +13,8 @@ #include "CPanelAttributes.h" #include "CPageGraph1.h" #include "CPageGraph2.h" +#include "TopToolbar.h" +#include "CMyStatusbar.h" // CServoDlg 对话框 @@ -30,7 +32,7 @@ void InitRxWindows(); void Resize(); void ShowChildPage(int index); - + CString& GetRuntimeFormatText(CString& strText, const char* pszSuffix); private: IObserver* m_pObserver; @@ -56,9 +58,11 @@ HICON m_hIcon; COLORREF m_crBkgnd; HBRUSH m_hbrBkgnd; + CTopToolbar* m_pTopToolbar; CPanelMaster* m_pPanelMaster; CPanelEquipment* m_pPanelEquipment; CPanelAttributes* m_pPanelAttributes; + CMyStatusbar* m_pMyStatusbar; // 生成的消息映射函数 virtual BOOL OnInitDialog(); @@ -90,4 +94,5 @@ afx_msg void OnTimer(UINT_PTR nIDEvent); afx_msg LRESULT OnPanelResize(WPARAM wParam, LPARAM lParam); afx_msg void OnTabSelChanged(NMHDR* nmhdr, LRESULT* result); + LRESULT OnToolbarBtnClicked(WPARAM wParam, LPARAM lParam); }; -- Gitblit v1.9.3