From 6fe6f0ccc9a788de59a8ea2c31ce2a0a02af80fa Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 09 一月 2025 14:09:48 +0800
Subject: [PATCH] Merge branch 'liuyang' into clh

---
 SourceCode/Bond/Servo/ServoDlg.h |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/SourceCode/Bond/Servo/ServoDlg.h b/SourceCode/Bond/Servo/ServoDlg.h
index d305005..df41e4a 100644
--- a/SourceCode/Bond/Servo/ServoDlg.h
+++ b/SourceCode/Bond/Servo/ServoDlg.h
@@ -5,6 +5,7 @@
 #pragma once
 #include "ServoGraph.h"
 #include "BlButton.h"
+#include "LogDlg.h"
 
 
 // CServoDlg 对话框
@@ -13,6 +14,12 @@
 // 构造
 public:
 	CServoDlg(CWnd* pParent = NULL);	// 标准构造函数
+
+
+private:
+	void Resize();
+	void UpdateLogBtn();
+
 
 // 对话框数据
 #ifdef AFX_DESIGN_TIME
@@ -25,6 +32,7 @@
 
 private:
 	BOOL m_bShowLogWnd;
+	CLogDlg* m_pLogDlg;
 
 // 实现
 protected:
@@ -47,4 +55,9 @@
 	afx_msg HBRUSH OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor);
 	afx_msg void OnDestroy();
 	afx_msg void OnBnClickedButtonLog();
+	afx_msg void OnSize(UINT nType, int cx, int cy);
+	afx_msg void OnClose();
+	afx_msg LRESULT OnLogDlgHide(WPARAM wParam, LPARAM lParam);
+	afx_msg void OnMoving(UINT fwSide, LPRECT pRect);
+	afx_msg void OnMove(int x, int y);
 };

--
Gitblit v1.9.3