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.h | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/MTerm1/MyFormInputShow.h b/MTerm1/MyFormInputShow.h
index 5680a86..3c61b36 100644
--- a/MTerm1/MyFormInputShow.h
+++ b/MTerm1/MyFormInputShow.h
@@ -3,7 +3,7 @@
#include "afxcmn.h"
#include "MTerm1View.h"
-
+#pragma region DDFINES CMyFormLog 窗体视图
// CMyFormLog 窗体视图
#define IDC_BUTTON_AND 33101
#define IDC_BUTTON_OR 33102
@@ -65,6 +65,9 @@
#define IDC_BUTTON_TML 34704
#define IDC_BUTTON_CT 34706
+#pragma endregion
+
+
typedef struct tagStructButton {
int nID;
CString sCaption;
@@ -86,13 +89,16 @@
bool bFloat1 = false;
bool bLeftLineUp = false;
bool brightLineUp = false;
- int param = 0;
+ int param = -1;
CString sCellName;
CString sParamName;
CString num = _T("");
+ int row = 0;
+ int col = 0;
+
void clear() { OP = 0; bnot = 0; bpp = 0; bpn = 0; bcmpEq = 0; bcmpLt = 0;
bcmpGt = 0; bDouble = 0; bDouble1 = 0; bFloat = 0; bFloat1 = 0; bLeftLineUp = 0; brightLineUp = 0;
- param = 0; sCellName.Empty(); num.Empty();
+ param = -1; sCellName = _T(""); sParamName = _T(""); num = _T("");
}
};
@@ -107,6 +113,9 @@
public:
enum { IDD = IDD_FORM_INPUTSHOW};
+
+
+
#ifdef _DEBUG
virtual void AssertValid() const;
#ifndef _WIN32_WCE
@@ -119,6 +128,8 @@
int m_Lines = 3;
CFont font1;
int current_btn_window = 0;
+
+ CMTerm1View::stCell focusCell;
tagInputCell m_InputCell;
@@ -237,6 +248,28 @@
afx_msg void OnChar(UINT nChar, UINT nRepCnt, UINT nFlags);
+
+ afx_msg void OnHotkey0();
+ afx_msg void OnHotkey1();
+ afx_msg void OnHotkeyF1();
+ afx_msg void OnHotkeyF2();
+ afx_msg void OnHotkeyF3();
+ afx_msg void OnHotkeyF4();
+ afx_msg void OnHotkeyF5();
+ afx_msg void OnHotkeyF6();
+ afx_msg void OnHotkeyF7();
+ afx_msg void OnHotkeyF8();
+ afx_msg void OnHotkeyF9();
+ afx_msg void OnHotkeyF11();
+ afx_msg void OnHotkeyF12();
+
+
+
+ afx_msg void OnHotkeyX();
+ afx_msg void OnHotkeyY();
+ afx_msg void OnHotkeyDelete();
+ afx_msg void OnHotkeyInsert();
+ afx_msg void OnKeyX();
};
--
Gitblit v1.9.1