From dd67df95a7303aee3bed65ffa935465f20ee8b32 Mon Sep 17 00:00:00 2001
From: QuakeGod <QuakeGod@sina.com>
Date: 星期五, 22 七月 2022 15:19:55 +0800
Subject: [PATCH] merge from dev2
---
MTerm2/ChildFrm.cpp | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/MTerm2/ChildFrm.cpp b/MTerm2/ChildFrm.cpp
index 187f69b..ea750d8 100644
--- a/MTerm2/ChildFrm.cpp
+++ b/MTerm2/ChildFrm.cpp
@@ -14,9 +14,9 @@
// CChildFrame
-IMPLEMENT_DYNCREATE(CChildFrame, CMDIChildWndEx)
+IMPLEMENT_DYNCREATE(CChildFrame, CMDIChildWnd)
-BEGIN_MESSAGE_MAP(CChildFrame, CMDIChildWndEx)
+BEGIN_MESSAGE_MAP(CChildFrame, CMDIChildWnd)
ON_WM_CREATE()
END_MESSAGE_MAP()
@@ -46,7 +46,7 @@
BOOL CChildFrame::PreCreateWindow(CREATESTRUCT& cs)
{
// TODO: 鍦ㄦ澶勯�氳繃淇敼 CREATESTRUCT cs 鏉ヤ慨鏀圭獥鍙ｇ被鎴栨牱寮�
- if( !CMDIChildWndEx::PreCreateWindow(cs) )
+ if( !CMDIChildWnd::PreCreateWindow(cs) )
return FALSE;
//淇敼绐楀彛鐨勭被鍨嬩负鏈�澶у寲鏍峰紡
// cs.style = cs.style | WS_MAXIMIZE | WS_VISIBLE;
@@ -58,12 +58,12 @@
#ifdef _DEBUG
void CChildFrame::AssertValid() const
{
- CMDIChildWndEx::AssertValid();
+ CMDIChildWnd::AssertValid();
}
void CChildFrame::Dump(CDumpContext& dc) const
{
- CMDIChildWndEx::Dump(dc);
+ CMDIChildWnd::Dump(dc);
}
#endif //_DEBUG
@@ -72,7 +72,7 @@
int CChildFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
{
- if (CMDIChildWndEx::OnCreate(lpCreateStruct) == -1)
+ if (CMDIChildWnd::OnCreate(lpCreateStruct) == -1)
return -1;
// TODO: 鍦ㄦ娣诲姞鎮ㄤ笓鐢ㄧ殑鍒涘缓浠ｇ爜
@@ -144,7 +144,7 @@
// m_wndToolBar_InfoShow.EnableDocking(CBRS_ALIGN_ANY);
// this->RecalcLayout();
-// DockPane(&m_wndToolBar_InputShow);
+// DockPane(&m_wndTBar_InputShow);
return 0;
}
--
Gitblit v1.9.1