From b978bfa096fdde06a7659838cf81ed4477777737 Mon Sep 17 00:00:00 2001
From: QuakeGod <QuakeGod@sina.com>
Date: 星期五, 27 五月 2022 18:10:38 +0800
Subject: [PATCH] change frameex to frame, and add func_key dialogbar

---
 MTerm2/MainFrm.h |   27 ++++++++++++++++++---------
 1 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/MTerm2/MainFrm.h b/MTerm2/MainFrm.h
index 7265ef7..6d23b0a 100644
--- a/MTerm2/MainFrm.h
+++ b/MTerm2/MainFrm.h
@@ -9,7 +9,12 @@
 //class CMyPaneLog;
 #include "MyDialogLog.h"
 #include "../MyLib/StaticEx.h"
-class CMainFrame : public CMDIFrameWndEx
+#include "CMyFuncKeyToolBar.h"
+#include "MyDlgBarFuncKey.h"
+#include "MyDialogLog.h"
+#include "MyDlgBarInputShow.h"
+
+class CMainFrame : public CMDIFrameWnd
 {
 	DECLARE_DYNAMIC(CMainFrame)
 public:
@@ -34,22 +39,25 @@
 #endif
 
 protected:  // 鎺т欢鏉″祵鍏ユ垚鍛�
-	CMFCToolBar          m_wndToolBar;
+	CToolBar          m_wndToolBar;
 
-	CMFCToolBar          m_wndToolBar_FuncKey;
-	CMFCToolBar          m_wndToolBar_Edit;
-	CMFCToolBar          m_wndToolBar_Num;
-	CMFCToolBar          m_wndToolBar_InputShow;
-	CMFCToolBar          m_wndToolBar_Comments;
+//	CMyFuncKeyToolBar   m_wndToolBar_Func_Key;
+	CMyDlgBarFuncKey	m_wndDlgBar_Func_Key;
+	CToolBar          m_wndTBar_Edit_Key;
+	CToolBar          m_wndTBar_Num_Key;
+//	CToolBar          m_wndTBar_InputShow;
+	CMyDlgBarInputShow m_wndDlgBar_InputShow;
+
+	CToolBar          m_wndToolBar_Comments;
 	
 	CNavView        m_wndNavView;
 
 	CEdit				m_InputShowEdit;
 	CStaticEx			m_InputShowStatic;
-	CMFCStatusBar        m_wndStatusBar;
+	CStatusBar        m_wndStatusBar;
 
 	CMyPaneLog		m_wndMyPaneLog;
-//	CMyDialogLog	m_dlgMyLog;
+	CMyDialogLog	m_dlgMyLog;
 
 // 鐢熸垚鐨勬秷鎭槧灏勫嚱鏁�
 protected:
@@ -73,6 +81,7 @@
 //	afx_msg void OnMenuViewBnl();
 
 	afx_msg void OnMenuShowLog();
+	virtual BOOL OnCmdMsg(UINT nID, int nCode, void* pExtra, AFX_CMDHANDLERINFO* pHandlerInfo);
 };
 
 

--
Gitblit v1.9.1