From 6fa60de2b0d0237054aa7571191df0f291838031 Mon Sep 17 00:00:00 2001
From: QuakeGod <quakegod@sina.com>
Date: 星期五, 20 十月 2023 22:27:53 +0800
Subject: [PATCH] fix conflict
---
MTerm1/MyFormInputShow.cpp | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/MTerm1/MyFormInputShow.cpp b/MTerm1/MyFormInputShow.cpp
index 7629e86..c01fc15 100644
--- a/MTerm1/MyFormInputShow.cpp
+++ b/MTerm1/MyFormInputShow.cpp
@@ -168,7 +168,7 @@
ON_WM_CHAR()
-
+ ON_COMMAND(ID_KEY_X, &CMyFormInputShow::OnKeyX)
END_MESSAGE_MAP()
// CMyFormLog 诊断
@@ -3784,3 +3784,11 @@
}
+void CMyFormInputShow::OnKeyX()
+{
+ // TODO: 在此添加命令处理程序代码
+ CMainFrame* p1 = (CMainFrame*)AfxGetMainWnd();
+ p1->GetInputInfo(0x00020001);
+
+ SetDisplay(0x00020001);
+}
--
Gitblit v1.9.1