Tera TermRevision: 7784
https://osdn.net/projects/ttssh2/scm/svn/commits/7784
Author: zmatsuo
Date: 2019-06-20 23:41:18 +0900 (Thu, 20 Jun 2019)
Log Message:
-----------
未使用部削除、整理
Modified Paths:
--------------
trunk/teraterm/teraterm/tekwin.cpp
trunk/teraterm/teraterm/tekwin.h
trunk/teraterm/teraterm/vtwin.cpp
trunk/teraterm/teraterm/vtwin.h
-------------- next part --------------
Modified: trunk/teraterm/teraterm/tekwin.cpp
===================================================================
--- trunk/teraterm/teraterm/tekwin.cpp 2019-06-20 14:41:07 UTC (rev 7783)
+++ trunk/teraterm/teraterm/tekwin.cpp 2019-06-20 14:41:18 UTC (rev 7784)
@@ -47,9 +47,6 @@
#include "dlglib.h"
#include <tchar.h>
-#define CWnd TTCWnd
-#define CFrameWnd TTCFrameWnd
-
#define TEKClassName _T("TEKWin32")
static HINSTANCE AfxGetInstanceHandle()
@@ -231,54 +228,6 @@
}
}
-#if 0
-BEGIN_MESSAGE_MAP(CTEKWindow, CFrameWnd)
- //{{AFX_MSG_MAP(CTEKWindow)
- ON_WM_ACTIVATE()
- ON_WM_CHAR()
- ON_WM_DESTROY()
- ON_WM_GETMINMAXINFO()
- ON_WM_INITMENUPOPUP()
- ON_WM_KEYDOWN()
- ON_WM_KEYUP()
- ON_WM_KILLFOCUS()
- ON_WM_LBUTTONDOWN()
- ON_WM_LBUTTONUP()
- ON_WM_MBUTTONUP()
- ON_WM_MOUSEACTIVATE()
- ON_WM_MOUSEMOVE()
- ON_WM_MOVE()
- ON_WM_PAINT()
- ON_WM_RBUTTONUP()
- ON_WM_SETFOCUS()
- ON_WM_SIZE()
- ON_WM_SYSCOMMAND()
- ON_WM_SYSKEYDOWN()
- ON_WM_SYSKEYUP()
- ON_WM_TIMER()
- ON_MESSAGE(WM_USER_ACCELCOMMAND, OnAccelCommand)
- ON_MESSAGE(WM_USER_CHANGEMENU,OnChangeMenu)
- ON_MESSAGE(WM_USER_CHANGETBAR,OnChangeTBar)
- ON_MESSAGE(WM_USER_DLGHELP2,OnDlgHelp)
- ON_MESSAGE(WM_USER_GETSERIALNO,OnGetSerialNo)
- ON_COMMAND(ID_TEKFILE_PRINT, OnFilePrint)
- ON_COMMAND(ID_TEKFILE_EXIT, OnFileExit)
- ON_COMMAND(ID_TEKEDIT_COPY, OnEditCopy)
- ON_COMMAND(ID_TEKEDIT_COPYSCREEN, OnEditCopyScreen)
- ON_COMMAND(ID_TEKEDIT_PASTE, OnEditPaste)
- ON_COMMAND(ID_TEKEDIT_PASTECR, OnEditPasteCR)
- ON_COMMAND(ID_TEKEDIT_CLEARSCREEN, OnEditClearScreen)
- ON_COMMAND(ID_TEKSETUP_WINDOW, OnSetupWindow)
- ON_COMMAND(ID_TEKSETUP_FONT, OnSetupFont)
- ON_COMMAND(ID_TEKVTWIN, OnVTWin)
- ON_COMMAND(ID_TEKWINDOW_WINDOW, OnWindowWindow)
- ON_COMMAND(ID_TEKHELP_INDEX, OnHelpIndex)
- ON_COMMAND(ID_TEKHELP_ABOUT, OnHelpAbout)
- ON_WM_TIMER()
- //}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-#endif
-
/////////////////////////////////////////////////////////////////////////////
// CTEKWindow message handler
@@ -289,7 +238,7 @@
return TRUE;
}
else {
- return CFrameWnd::OnCommand(wParam, lParam);
+ return TTCFrameWnd::OnCommand(wParam, lParam);
}
}
@@ -332,7 +281,7 @@
// remove this window from the window list
UnregWin(HTEKWin);
- CFrameWnd::OnDestroy();
+ TTCFrameWnd::OnDestroy();
TEKEnd(&tk);
FreeTTTEK();
@@ -367,7 +316,7 @@
void CTEKWindow::OnKillFocus(HWND hNewWnd)
{
TEKDestroyCaret(&tk,&ts);
- CFrameWnd::OnKillFocus(hNewWnd);
+ TTCFrameWnd::OnKillFocus(hNewWnd);
}
void CTEKWindow::OnLButtonDown(UINT nFlags, POINTS point)
@@ -483,7 +432,7 @@
void CTEKWindow::OnSetFocus(HWND hOldWnd)
{
TEKChangeCaret(&tk,&ts);
- CFrameWnd::OnSetFocus(hOldWnd);
+ TTCFrameWnd::OnSetFocus(hOldWnd);
}
void CTEKWindow::OnSize(UINT nType, int cx, int cy)
@@ -514,7 +463,7 @@
SwitchMenu();
}
else {
- CFrameWnd::OnSysCommand(nID,lParam);
+ TTCFrameWnd::OnSysCommand(nID,lParam);
}
}
@@ -524,7 +473,7 @@
OnKeyDown(nChar,nRepCnt,nFlags);
}
else {
- CFrameWnd::OnSysKeyDown(nChar,nRepCnt,nFlags);
+ TTCFrameWnd::OnSysKeyDown(nChar,nRepCnt,nFlags);
}
}
@@ -534,7 +483,7 @@
OnKeyUp(nChar,nRepCnt,nFlags);
}
else {
- CFrameWnd::OnSysKeyUp(nChar,nRepCnt,nFlags);
+ TTCFrameWnd::OnSysKeyUp(nChar,nRepCnt,nFlags);
}
}
Modified: trunk/teraterm/teraterm/tekwin.h
===================================================================
--- trunk/teraterm/teraterm/tekwin.h 2019-06-20 14:41:07 UTC (rev 7783)
+++ trunk/teraterm/teraterm/tekwin.h 2019-06-20 14:41:18 UTC (rev 7784)
@@ -47,59 +47,46 @@
void InitMenuPopup(HMENU SubMenu);
protected:
-
-public:
- //{{AFX_VIRTUAL(CTEKWindow)
- protected:
virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam);
- //}}AFX_VIRTUAL
-
-protected:
- //{{AFX_MSG(CTEKWindow)
-#define afx_msg
- afx_msg void OnActivate(UINT nState, HWND pWndOther, BOOL bMinimized);
- afx_msg void OnChar(UINT nChar, UINT nRepCnt, UINT nFlags);
- afx_msg void OnDestroy();
- afx_msg void OnGetMinMaxInfo(MINMAXINFO *lpMMI);
- afx_msg void OnInitMenuPopup(HMENU hPopupMenu, UINT nIndex, BOOL bSysMenu);
- afx_msg void OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
- afx_msg void OnKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags);
- afx_msg void OnKillFocus(HWND hNewWnd);
- afx_msg void OnLButtonDown(UINT nFlags, POINTS point);
- afx_msg void OnLButtonUp(UINT nFlags, POINTS point);
- afx_msg void OnMButtonUp(UINT nFlags, POINTS point);
- afx_msg int OnMouseActivate(HWND hDesktopWnd, UINT nHitTest, UINT message);
- afx_msg void OnMouseMove(UINT nFlags, POINTS point);
- afx_msg void OnMove(int x, int y);
- afx_msg void OnPaint();
- afx_msg void OnRButtonUp(UINT nFlags, POINTS point);
- afx_msg void OnSetFocus(HWND hOldWnd);
- afx_msg void OnSize(UINT nType, int cx, int cy);
- afx_msg void OnSysCommand(UINT nID, LPARAM lParam);
- afx_msg void OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
- afx_msg void OnSysKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags);
- afx_msg void OnTimer(UINT_PTR nIDEvent);
- afx_msg LRESULT OnAccelCommand(WPARAM wParam, LPARAM lParam);
- afx_msg LRESULT OnChangeMenu(WPARAM wParam, LPARAM lParam);
- afx_msg LRESULT OnChangeTBar(WPARAM wParam, LPARAM lParam);
- afx_msg LRESULT OnDlgHelp(WPARAM wParam, LPARAM lParam);
- afx_msg LRESULT OnGetSerialNo(WPARAM wParam, LPARAM lParam);
- afx_msg void OnFilePrint();
- afx_msg void OnFileExit();
- afx_msg void OnEditCopy();
- afx_msg void OnEditCopyScreen();
- afx_msg void OnEditPaste();
- afx_msg void OnEditPasteCR();
- afx_msg void OnEditClearScreen();
- afx_msg void OnSetupWindow();
- afx_msg void OnSetupFont();
- afx_msg void OnVTWin();
- afx_msg void OnWindowWindow();
- afx_msg void OnHelpIndex();
- afx_msg void OnHelpUsing();
- afx_msg void OnHelpAbout();
- //}}AFX_MSG
-// DECLARE_MESSAGE_MAP()
-#undef afx_msg
+ void OnActivate(UINT nState, HWND pWndOther, BOOL bMinimized);
+ void OnChar(UINT nChar, UINT nRepCnt, UINT nFlags);
+ void OnDestroy();
+ void OnGetMinMaxInfo(MINMAXINFO *lpMMI);
+ void OnInitMenuPopup(HMENU hPopupMenu, UINT nIndex, BOOL bSysMenu);
+ void OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
+ void OnKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags);
+ void OnKillFocus(HWND hNewWnd);
+ void OnLButtonDown(UINT nFlags, POINTS point);
+ void OnLButtonUp(UINT nFlags, POINTS point);
+ void OnMButtonUp(UINT nFlags, POINTS point);
+ int OnMouseActivate(HWND hDesktopWnd, UINT nHitTest, UINT message);
+ void OnMouseMove(UINT nFlags, POINTS point);
+ void OnMove(int x, int y);
+ void OnPaint();
+ void OnRButtonUp(UINT nFlags, POINTS point);
+ void OnSetFocus(HWND hOldWnd);
+ void OnSize(UINT nType, int cx, int cy);
+ void OnSysCommand(UINT nID, LPARAM lParam);
+ void OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
+ void OnSysKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags);
+ void OnTimer(UINT_PTR nIDEvent);
+ LRESULT OnAccelCommand(WPARAM wParam, LPARAM lParam);
+ LRESULT OnChangeMenu(WPARAM wParam, LPARAM lParam);
+ LRESULT OnChangeTBar(WPARAM wParam, LPARAM lParam);
+ LRESULT OnDlgHelp(WPARAM wParam, LPARAM lParam);
+ LRESULT OnGetSerialNo(WPARAM wParam, LPARAM lParam);
+ void OnFilePrint();
+ void OnFileExit();
+ void OnEditCopy();
+ void OnEditCopyScreen();
+ void OnEditPaste();
+ void OnEditPasteCR();
+ void OnEditClearScreen();
+ void OnSetupWindow();
+ void OnSetupFont();
+ void OnVTWin();
+ void OnWindowWindow();
+ void OnHelpIndex();
+ void OnHelpAbout();
virtual LRESULT Proc(UINT msg, WPARAM wp, LPARAM lp);
};
Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp 2019-06-20 14:41:07 UTC (rev 7783)
+++ trunk/teraterm/teraterm/vtwin.cpp 2019-06-20 14:41:18 UTC (rev 7784)
@@ -91,8 +91,6 @@
DEFINE_GUID(GUID_DEVINTERFACE_USB_DEVICE, 0xA5DCBF10L, 0x6530, 0x11D2, 0x90, 0x1F, 0x00, \
0xC0, 0x4F, 0xB9, 0x51, 0xED);
-#define CFrameWnd TTCFrameWnd
-
#define VTClassName _T("VTWin32")
#undef SetDlgItemText
@@ -149,150 +147,6 @@
/////////////////////////////////////////////////////////////////////////////
// CVTWindow
-#if 0
-BEGIN_MESSAGE_MAP(CVTWindow, CFrameWnd)
- //{{AFX_MSG_MAP(CVTWindow)
- ON_WM_ACTIVATE()
- ON_WM_CHAR()
- ON_WM_CLOSE()
- ON_WM_DESTROY()
- ON_WM_DROPFILES()
- ON_WM_GETMINMAXINFO()
- ON_WM_HSCROLL()
- ON_WM_INITMENUPOPUP()
- ON_WM_KEYDOWN()
- ON_WM_KEYUP()
- ON_WM_KILLFOCUS()
- ON_WM_LBUTTONDBLCLK()
- ON_WM_LBUTTONDOWN()
- ON_WM_LBUTTONUP()
- ON_WM_MBUTTONDOWN()
- ON_WM_MBUTTONUP()
- ON_WM_MOUSEACTIVATE()
- ON_WM_MOUSEMOVE()
- ON_WM_MOUSEWHEEL()
- ON_WM_MOVE()
- ON_WM_NCLBUTTONDBLCLK()
- ON_WM_NCRBUTTONDOWN()
- ON_WM_NCCALCSIZE()
- ON_WM_PAINT()
- ON_WM_RBUTTONDOWN()
- ON_WM_RBUTTONUP()
- ON_WM_SETFOCUS()
- ON_WM_SIZE()
- ON_WM_SIZING()
- ON_WM_SYSCHAR()
- ON_WM_SYSCOLORCHANGE()
- ON_WM_SYSCOMMAND()
- ON_WM_SYSKEYDOWN()
- ON_WM_SYSKEYUP()
- ON_WM_TIMER()
- ON_WM_VSCROLL()
- ON_WM_DEVICECHANGE()
- ON_MESSAGE(WM_IME_STARTCOMPOSITION,OnIMEStartComposition)
- ON_MESSAGE(WM_IME_ENDCOMPOSITION,OnIMEEndComposition)
- ON_MESSAGE(WM_IME_COMPOSITION,OnIMEComposition)
- ON_MESSAGE(WM_INPUTLANGCHANGE,OnIMEInputChange)
- ON_MESSAGE(WM_IME_NOTIFY,OnIMENotify)
- ON_MESSAGE(WM_IME_REQUEST,OnIMERequest)
-//<!--by AKASI
- ON_MESSAGE(WM_WINDOWPOSCHANGING,OnWindowPosChanging)
- ON_MESSAGE(WM_SETTINGCHANGE,OnSettingChange)
- ON_MESSAGE(WM_ENTERSIZEMOVE,OnEnterSizeMove)
- ON_MESSAGE(WM_EXITSIZEMOVE ,OnExitSizeMove)
-//-->
- ON_MESSAGE(WM_USER_ACCELCOMMAND, OnAccelCommand)
- ON_MESSAGE(WM_USER_CHANGEMENU,OnChangeMenu)
- ON_MESSAGE(WM_USER_CHANGETBAR,OnChangeTBar)
- ON_MESSAGE(WM_USER_COMMNOTIFY,OnCommNotify)
- ON_MESSAGE(WM_USER_COMMOPEN,OnCommOpen)
- ON_MESSAGE(WM_USER_COMMSTART,OnCommStart)
- ON_MESSAGE(WM_USER_DDEEND,OnDdeEnd)
- ON_MESSAGE(WM_USER_DLGHELP2,OnDlgHelp)
- ON_MESSAGE(WM_USER_FTCANCEL,OnFileTransEnd)
- ON_MESSAGE(WM_USER_GETSERIALNO,OnGetSerialNo)
- ON_MESSAGE(WM_USER_KEYCODE,OnKeyCode)
- ON_MESSAGE(WM_USER_PROTOCANCEL,OnProtoEnd)
- ON_MESSAGE(WM_USER_CHANGETITLE,OnChangeTitle)
- ON_MESSAGE(WM_COPYDATA,OnReceiveIpcMessage)
- ON_MESSAGE(WM_USER_NONCONFIRM_CLOSE, OnNonConfirmClose)
- ON_MESSAGE(WM_USER_NOTIFYICON, OnNotifyIcon)
- ON_COMMAND(ID_FILE_NEWCONNECTION, OnFileNewConnection)
- ON_COMMAND(ID_FILE_DUPLICATESESSION, OnDuplicateSession)
- ON_COMMAND(ID_FILE_CYGWINCONNECTION, OnCygwinConnection)
- ON_COMMAND(ID_FILE_TERATERMMENU, OnTTMenuLaunch)
- ON_COMMAND(ID_FILE_LOGMEIN, OnLogMeInLaunch)
- ON_COMMAND(ID_FILE_LOG, OnFileLog)
- ON_COMMAND(ID_FILE_COMMENTTOLOG, OnCommentToLog)
- ON_COMMAND(ID_FILE_VIEWLOG, OnViewLog)
- ON_COMMAND(ID_FILE_SHOWLOGDIALOG, OnShowLogDialog)
- ON_COMMAND(ID_FILE_REPLAYLOG, OnReplayLog)
- ON_COMMAND(ID_FILE_SENDFILE, OnFileSend)
- ON_COMMAND(ID_FILE_KERMITRCV, OnFileKermitRcv)
- ON_COMMAND(ID_FILE_KERMITGET, OnFileKermitGet)
- ON_COMMAND(ID_FILE_KERMITSEND, OnFileKermitSend)
- ON_COMMAND(ID_FILE_KERMITFINISH, OnFileKermitFinish)
- ON_COMMAND(ID_FILE_XRCV, OnFileXRcv)
- ON_COMMAND(ID_FILE_XSEND, OnFileXSend)
- ON_COMMAND(ID_FILE_YRCV, OnFileYRcv)
- ON_COMMAND(ID_FILE_YSEND, OnFileYSend)
- ON_COMMAND(ID_FILE_ZRCV, OnFileZRcv)
- ON_COMMAND(ID_FILE_ZSEND, OnFileZSend)
- ON_COMMAND(ID_FILE_BPRCV, OnFileBPRcv)
- ON_COMMAND(ID_FILE_BPSEND, OnFileBPSend)
- ON_COMMAND(ID_FILE_QVRCV, OnFileQVRcv)
- ON_COMMAND(ID_FILE_QVSEND, OnFileQVSend)
- ON_COMMAND(ID_FILE_CHANGEDIR, OnFileChangeDir)
- ON_COMMAND(ID_FILE_PRINT2, OnFilePrint)
- ON_COMMAND(ID_FILE_DISCONNECT, OnFileDisconnect)
- ON_COMMAND(ID_FILE_EXIT, OnFileExit)
- ON_COMMAND(ID_FILE_EXITALL, OnAllClose)
- ON_COMMAND(ID_EDIT_COPY2, OnEditCopy)
- ON_COMMAND(ID_EDIT_COPYTABLE, OnEditCopyTable)
- ON_COMMAND(ID_EDIT_PASTE2, OnEditPaste)
- ON_COMMAND(ID_EDIT_PASTECR, OnEditPasteCR)
- ON_COMMAND(ID_EDIT_CLEARSCREEN, OnEditClearScreen)
- ON_COMMAND(ID_EDIT_CLEARBUFFER, OnEditClearBuffer)
- ON_COMMAND(ID_EDIT_CANCELSELECT, OnEditCancelSelection)
- ON_COMMAND(ID_EDIT_SELECTALL, OnEditSelectAllBuffer)
- ON_COMMAND(ID_EDIT_SELECTSCREEN, OnEditSelectScreenBuffer)
- ON_COMMAND(ID_SETUP_ADDITIONALSETTINGS, OnExternalSetup)
- ON_COMMAND(ID_SETUP_TERMINAL, OnSetupTerminal)
- ON_COMMAND(ID_SETUP_WINDOW, OnSetupWindow)
- ON_COMMAND(ID_SETUP_FONT, OnSetupFont)
- ON_COMMAND(ID_SETUP_KEYBOARD, OnSetupKeyboard)
- ON_COMMAND(ID_SETUP_SERIALPORT, OnSetupSerialPort)
- ON_COMMAND(ID_SETUP_TCPIP, OnSetupTCPIP)
- ON_COMMAND(ID_SETUP_GENERAL, OnSetupGeneral)
- ON_COMMAND(ID_SETUP_SAVE, OnSetupSave)
- ON_COMMAND(ID_SETUP_RESTORE, OnSetupRestore)
- ON_COMMAND(ID_OPEN_SETUP, OnOpenSetupDirectory)
- ON_COMMAND(ID_SETUP_LOADKEYMAP, OnSetupLoadKeyMap)
- ON_COMMAND(ID_CONTROL_RESETTERMINAL, OnControlResetTerminal)
- ON_COMMAND(ID_CONTROL_RESETREMOTETITLE, OnControlResetRemoteTitle)
- ON_COMMAND(ID_CONTROL_AREYOUTHERE, OnControlAreYouThere)
- ON_COMMAND(ID_CONTROL_SENDBREAK, OnControlSendBreak)
- ON_COMMAND(ID_CONTROL_RESETPORT, OnControlResetPort)
- ON_COMMAND(ID_CONTROL_BROADCASTCOMMAND, OnControlBroadcastCommand)
- ON_COMMAND(ID_CONTROL_OPENTEK, OnControlOpenTEK)
- ON_COMMAND(ID_CONTROL_CLOSETEK, OnControlCloseTEK)
- ON_COMMAND(ID_CONTROL_MACRO, OnControlMacro)
- ON_COMMAND(ID_CONTROL_SHOW_MACRO, OnShowMacroWindow)
- ON_COMMAND(ID_WINDOW_WINDOW, OnWindowWindow)
- ON_COMMAND(ID_WINDOW_MINIMIZEALL, OnWindowMinimizeAll)
- ON_COMMAND(ID_WINDOW_CASCADEALL, OnWindowCascade)
- ON_COMMAND(ID_WINDOW_STACKED, OnWindowStacked)
- ON_COMMAND(ID_WINDOW_SIDEBYSIDE, OnWindowSidebySide)
- ON_COMMAND(ID_WINDOW_RESTOREALL, OnWindowRestoreAll)
- ON_COMMAND(ID_WINDOW_UNDO, OnWindowUndo)
- ON_COMMAND(ID_HELP_INDEX2, OnHelpIndex)
- ON_COMMAND(ID_HELP_ABOUT, OnHelpAbout)
- ON_MESSAGE(WM_USER_DROPNOTIFY, OnDropNotify)
- ON_MESSAGE(WM_DPICHANGED, OnDpiChanged)
- //}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-#endif
-
static HINSTANCE AfxGetInstanceHandle()
{
return hInst;
@@ -1860,7 +1714,7 @@
return TRUE;
}
else { /* TTPLUG */
- return CFrameWnd::OnCommand(wParam, lParam);
+ return TTCFrameWnd::OnCommand(wParam, lParam);
}
}
}
@@ -2017,7 +1871,7 @@
FreeBuffer();
- CFrameWnd::OnDestroy();
+ TTCFrameWnd::OnDestroy();
TTXEnd(); /* TTPLUG */
DeleteNotifyIcon(&cv);
@@ -2418,7 +2272,7 @@
{
DispDestroyCaret();
FocusReport(FALSE);
-// CFrameWnd::OnKillFocus(hNewWnd); // TODO
+// TTCFrameWnd::OnKillFocus(hNewWnd); // TODO
if (IsCaretOn()) {
CaretKillFocus(TRUE);
@@ -2872,7 +2726,7 @@
break;
}
-//TODO CFrameWnd::OnSizing(fwSide, pRect);
+//TODO TTCFrameWnd::OnSizing(fwSide, pRect);
}
void CVTWindow::OnSysChar(UINT nChar, UINT nRepCnt, UINT nFlags)
@@ -2924,7 +2778,7 @@
return;
}
- CFrameWnd::DefWindowProc(WM_SYSCHAR, nChar, MAKELONG(nRepCnt, nFlags));
+ TTCFrameWnd::DefWindowProc(WM_SYSCHAR, nChar, MAKELONG(nRepCnt, nFlags));
}
void CVTWindow::OnSysCommand(UINT nID, LPARAM lParam)
@@ -2940,7 +2794,7 @@
}
#if 0
else {
- CFrameWnd::OnSysCommand(nID,lParam);
+ TTCFrameWnd::OnSysCommand(nID,lParam);
}
#endif
}
@@ -2952,7 +2806,7 @@
// OnKeyDown(nChar,nRepCnt,nFlags);
}
else {
- CFrameWnd::OnSysKeyDown(nChar,nRepCnt,nFlags);
+ TTCFrameWnd::OnSysKeyDown(nChar,nRepCnt,nFlags);
}
}
@@ -2962,7 +2816,7 @@
OnKeyUp(nChar,nRepCnt,nFlags);
}
else {
- CFrameWnd::OnSysKeyUp(nChar,nRepCnt,nFlags);
+ TTCFrameWnd::OnSysKeyUp(nChar,nRepCnt,nFlags);
}
}
@@ -3175,7 +3029,7 @@
}
#endif
- return CFrameWnd::DefWindowProc(WM_WINDOWPOSCHANGING,wParam,lParam);
+ return TTCFrameWnd::DefWindowProc(WM_WINDOWPOSCHANGING,wParam,lParam);
}
LRESULT CVTWindow::OnSettingChange(WPARAM wParam, LPARAM lParam)
@@ -3183,7 +3037,7 @@
#ifdef ALPHABLEND_TYPE2
BGOnSettingChange();
#endif
- return CFrameWnd::DefWindowProc(WM_SETTINGCHANGE,wParam,lParam);
+ return TTCFrameWnd::DefWindowProc(WM_SETTINGCHANGE,wParam,lParam);
}
LRESULT CVTWindow::OnEnterSizeMove(WPARAM wParam, LPARAM lParam)
@@ -3193,7 +3047,7 @@
#ifdef ALPHABLEND_TYPE2
BGOnEnterSizeMove();
#endif
- return CFrameWnd::DefWindowProc(WM_ENTERSIZEMOVE,wParam,lParam);
+ return TTCFrameWnd::DefWindowProc(WM_ENTERSIZEMOVE,wParam,lParam);
}
LRESULT CVTWindow::OnExitSizeMove(WPARAM wParam, LPARAM lParam)
@@ -3204,7 +3058,7 @@
EnableSizeTip(0);
- return CFrameWnd::DefWindowProc(WM_EXITSIZEMOVE,wParam,lParam);
+ return TTCFrameWnd::DefWindowProc(WM_EXITSIZEMOVE,wParam,lParam);
}
//-->
@@ -3217,13 +3071,13 @@
int CaretY = (CursorY-WinOrgY)*FontHeight;
SetConversionWindow(HVTWin,CaretX,CaretY);
- return CFrameWnd::DefWindowProc(WM_IME_STARTCOMPOSITION,wParam,lParam);
+ return TTCFrameWnd::DefWindowProc(WM_IME_STARTCOMPOSITION,wParam,lParam);
}
LRESULT CVTWindow::OnIMEEndComposition(WPARAM wParam, LPARAM lParam)
{
IMECompositionState = FALSE;
- return CFrameWnd::DefWindowProc(WM_IME_ENDCOMPOSITION,wParam,lParam);
+ return TTCFrameWnd::DefWindowProc(WM_IME_ENDCOMPOSITION,wParam,lParam);
}
LRESULT CVTWindow::OnIMEComposition(WPARAM wParam, LPARAM lParam)
@@ -3253,7 +3107,7 @@
return 0;
}
}
- return CFrameWnd::DefWindowProc(WM_IME_COMPOSITION,wParam,lParam);
+ return TTCFrameWnd::DefWindowProc(WM_IME_COMPOSITION,wParam,lParam);
}
LRESULT CVTWindow::OnIMEInputChange(WPARAM wParam, LPARAM lParam)
@@ -3260,7 +3114,7 @@
{
ChangeCaret();
- return CFrameWnd::DefWindowProc(WM_INPUTLANGCHANGE,wParam,lParam);
+ return TTCFrameWnd::DefWindowProc(WM_INPUTLANGCHANGE,wParam,lParam);
}
LRESULT CVTWindow::OnIMENotify(WPARAM wParam, LPARAM lParam)
@@ -3306,7 +3160,7 @@
break;
}
- return CFrameWnd::DefWindowProc(WM_IME_NOTIFY,wParam,lParam);
+ return TTCFrameWnd::DefWindowProc(WM_IME_NOTIFY,wParam,lParam);
}
static LRESULT ReplyIMERequestDocumentfeed(HWND hWnd, LPARAM lParam)
@@ -3381,7 +3235,7 @@
break;
}
}
- return CFrameWnd::DefWindowProc(WM_IME_REQUEST,wParam,lParam);
+ return TTCFrameWnd::DefWindowProc(WM_IME_REQUEST,wParam,lParam);
}
LONG CVTWindow::OnAccelCommand(UINT wParam, LONG lParam)
@@ -6630,7 +6484,7 @@
break;
}
case WM_NCHITTEST: {
- retval = CFrameWnd::DefWindowProc(msg, wp ,lp);
+ retval = TTCFrameWnd::DefWindowProc(msg, wp ,lp);
if (ts.HideTitle>0) {
if ((retval == HTCLIENT) && AltKey()) {
#ifdef ALPHABLEND_TYPE2
Modified: trunk/teraterm/teraterm/vtwin.h
===================================================================
--- trunk/teraterm/teraterm/vtwin.h 2019-06-20 14:41:07 UTC (rev 7783)
+++ trunk/teraterm/teraterm/vtwin.h 2019-06-20 14:41:18 UTC (rev 7784)
@@ -64,8 +64,6 @@
// DPI
BOOL IgnoreSizeMessage;
-protected:
-
public:
CVTWindow();
int Parse();
@@ -80,158 +78,145 @@
void Startup();
void OpenTEK();
- //{{AFX_VIRTUAL(CVTWindow)
- protected:
+protected:
virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam);
- //}}AFX_VIRTUAL
-
-protected:
- //{{AFX_MSG(CVTWindow)
-#define afx_msg
- afx_msg void OnActivate(UINT nState, HWND pWndOther, BOOL bMinimized);
- afx_msg void OnChar(UINT nChar, UINT nRepCnt, UINT nFlags);
- afx_msg void OnClose();
- afx_msg void OnAllClose();
- afx_msg void OnDestroy();
- afx_msg void OnDropFiles(HDROP hDropInfo);
- afx_msg void OnGetMinMaxInfo(MINMAXINFO *lpMMI);
- afx_msg void OnHScroll(UINT nSBCode, UINT nPos, HWND pScrollBar);
- afx_msg void OnInitMenuPopup(HMENU hPopupMenu, UINT nIndex, BOOL bSysMenu);
- afx_msg void OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
- afx_msg void OnKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags);
- afx_msg void OnKillFocus(HWND hNewWnd);
- afx_msg void OnLButtonDblClk(UINT nFlags, POINTS point);
- afx_msg void OnLButtonDown(UINT nFlags, POINTS point);
- afx_msg void OnLButtonUp(UINT nFlags, POINTS point);
- afx_msg void OnMButtonDown(UINT nFlags, POINTS point);
- afx_msg void OnMButtonUp(UINT nFlags, POINTS point);
- afx_msg int OnMouseActivate(HWND pDesktopWnd, UINT nHitTest, UINT message);
- afx_msg void OnMouseMove(UINT nFlags, POINTS point);
- afx_msg void OnMove(int x, int y);
- afx_msg BOOL OnMouseWheel(UINT nFlags, short zDelta, POINTS pt);
-// afx_msg void OnNcCalcSize(BOOL valid, NCCALCSIZE_PARAMS *calcsize); // \x89\xBD\x82\xE0\x82\xB5\x82Ă\xA2\x82Ȃ\xA2\x81A\x95s\x97v
- afx_msg void OnNcLButtonDblClk(UINT nHitTest, POINTS point);
- afx_msg void OnNcRButtonDown(UINT nHitTest, POINTS point);
- afx_msg void OnPaint();
- afx_msg void OnRButtonDown(UINT nFlags, POINTS point);
- afx_msg void OnRButtonUp(UINT nFlags, POINTS point);
- afx_msg void OnSetFocus(HWND hOldWnd);
- afx_msg void OnSize(UINT nType, int cx, int cy);
- afx_msg void OnSizing(UINT fwSide, LPRECT pRect);
- afx_msg void OnSysChar(UINT nChar, UINT nRepCnt, UINT nFlags);
-// afx_msg void OnSysColorChange(); // \x89\xBD\x82\xE0\x82\xB5\x82Ă\xA2\x82Ȃ\xA2\x81A\x95s\x97v
- afx_msg void OnSysCommand(UINT nID, LPARAM lParam);
- afx_msg void OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
- afx_msg void OnSysKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags);
- afx_msg void OnTimer(UINT_PTR nIDEvent);
- afx_msg void OnVScroll(UINT nSBCode, UINT nPos, HWND pScrollBar);
- afx_msg BOOL OnDeviceChange(UINT nEventType, DWORD_PTR dwData);
+ void OnActivate(UINT nState, HWND pWndOther, BOOL bMinimized);
+ void OnChar(UINT nChar, UINT nRepCnt, UINT nFlags);
+ void OnClose();
+ void OnAllClose();
+ void OnDestroy();
+ void OnDropFiles(HDROP hDropInfo);
+ void OnGetMinMaxInfo(MINMAXINFO *lpMMI);
+ void OnHScroll(UINT nSBCode, UINT nPos, HWND pScrollBar);
+ void OnInitMenuPopup(HMENU hPopupMenu, UINT nIndex, BOOL bSysMenu);
+ void OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
+ void OnKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags);
+ void OnKillFocus(HWND hNewWnd);
+ void OnLButtonDblClk(UINT nFlags, POINTS point);
+ void OnLButtonDown(UINT nFlags, POINTS point);
+ void OnLButtonUp(UINT nFlags, POINTS point);
+ void OnMButtonDown(UINT nFlags, POINTS point);
+ void OnMButtonUp(UINT nFlags, POINTS point);
+ int OnMouseActivate(HWND pDesktopWnd, UINT nHitTest, UINT message);
+ void OnMouseMove(UINT nFlags, POINTS point);
+ void OnMove(int x, int y);
+ BOOL OnMouseWheel(UINT nFlags, short zDelta, POINTS pt);
+ void OnNcLButtonDblClk(UINT nHitTest, POINTS point);
+ void OnNcRButtonDown(UINT nHitTest, POINTS point);
+ void OnPaint();
+ void OnRButtonDown(UINT nFlags, POINTS point);
+ void OnRButtonUp(UINT nFlags, POINTS point);
+ void OnSetFocus(HWND hOldWnd);
+ void OnSize(UINT nType, int cx, int cy);
+ void OnSizing(UINT fwSide, LPRECT pRect);
+ void OnSysChar(UINT nChar, UINT nRepCnt, UINT nFlags);
+ void OnSysCommand(UINT nID, LPARAM lParam);
+ void OnSysKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
+ void OnSysKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags);
+ void OnTimer(UINT_PTR nIDEvent);
+ void OnVScroll(UINT nSBCode, UINT nPos, HWND pScrollBar);
+ BOOL OnDeviceChange(UINT nEventType, DWORD_PTR dwData);
//<!--by AKASI
- afx_msg LRESULT OnWindowPosChanging(WPARAM wParam, LPARAM lParam);
- afx_msg LRESULT OnSettingChange(WPARAM wParam, LPARAM lParam);
- afx_msg LRESULT OnEnterSizeMove(WPARAM wParam, LPARAM lParam);
- afx_msg LRESULT OnExitSizeMove(WPARAM wParam, LPARAM lParam);
+ LRESULT OnWindowPosChanging(WPARAM wParam, LPARAM lParam);
+ LRESULT OnSettingChange(WPARAM wParam, LPARAM lParam);
+ LRESULT OnEnterSizeMove(WPARAM wParam, LPARAM lParam);
+ LRESULT OnExitSizeMove(WPARAM wParam, LPARAM lParam);
//-->
- afx_msg LRESULT OnIMEStartComposition(WPARAM wParam, LPARAM lParam);
- afx_msg LRESULT OnIMEEndComposition(WPARAM wParam, LPARAM lParam);
- afx_msg LRESULT OnIMEComposition(UINT wParam, LONG lParam);
- afx_msg LRESULT OnIMEInputChange(WPARAM wParam, LPARAM lParam);
- afx_msg LRESULT OnIMENotify(WPARAM wParam, LPARAM lParam);
- afx_msg LRESULT OnIMERequest(WPARAM wParam, LPARAM lParam);
- afx_msg LRESULT OnAccelCommand(WPARAM wParam, LPARAM lParam);
- afx_msg LRESULT OnChangeMenu(WPARAM wParam, LPARAM lParam);
- afx_msg LRESULT OnChangeTBar(WPARAM wParam, LPARAM lParam);
- afx_msg LRESULT OnCommNotify(WPARAM wParam, LPARAM lParam);
- afx_msg LRESULT OnCommOpen(WPARAM wParam, LPARAM lParam);
- afx_msg LRESULT OnCommStart(WPARAM wParam, LPARAM lParam);
- afx_msg LRESULT OnDdeEnd(WPARAM wParam, LPARAM lParam);
- afx_msg LRESULT OnDlgHelp(WPARAM wParam, LPARAM lParam);
- afx_msg LRESULT OnFileTransEnd(WPARAM wParam, LPARAM lParam);
- afx_msg LRESULT OnGetSerialNo(WPARAM wParam, LPARAM lParam);
- afx_msg LRESULT OnKeyCode(WPARAM wParam, LPARAM lParam);
- afx_msg LRESULT OnProtoEnd(WPARAM wParam, LPARAM lParam);
- afx_msg LRESULT OnChangeTitle(WPARAM wParam, LPARAM lParam);
- afx_msg LRESULT OnReceiveIpcMessage(WPARAM wParam, LPARAM lParam);
- afx_msg LRESULT OnNonConfirmClose(WPARAM wParam, LPARAM lParam);
- afx_msg LRESULT OnNotifyIcon(WPARAM wParam, LPARAM lParam);
- afx_msg void OnFileNewConnection();
- afx_msg void OnDuplicateSession();
- afx_msg void OnCygwinConnection();
- afx_msg void OnTTMenuLaunch();
- afx_msg void OnLogMeInLaunch();
- afx_msg void OnFileLog();
- afx_msg void OnCommentToLog();
- afx_msg void OnViewLog();
- afx_msg void OnShowLogDialog();
- afx_msg void OnReplayLog();
- afx_msg void OnExternalSetup();
- afx_msg void OnFileSend();
- afx_msg void OnFileKermitRcv();
- afx_msg void OnFileKermitGet();
- afx_msg void OnFileKermitSend();
- afx_msg void OnFileKermitFinish();
- afx_msg void OnFileXRcv();
- afx_msg void OnFileXSend();
- afx_msg void OnFileYRcv();
- afx_msg void OnFileYSend();
- afx_msg void OnFileZRcv();
- afx_msg void OnFileZSend();
- afx_msg void OnFileBPRcv();
- afx_msg void OnFileBPSend();
- afx_msg void OnFileQVRcv();
- afx_msg void OnFileQVSend();
- afx_msg void OnFileChangeDir();
- afx_msg void OnFilePrint();
- afx_msg void OnFileDisconnect();
- afx_msg void OnFileExit();
- afx_msg void OnEditCopy();
- afx_msg void OnEditCopyTable();
- afx_msg void OnEditPaste();
- afx_msg void OnEditPasteCR();
- afx_msg void OnEditClearScreen();
- afx_msg void OnEditClearBuffer();
- afx_msg void OnEditCancelSelection();
- afx_msg void OnEditSelectScreenBuffer();
- afx_msg void OnEditSelectAllBuffer();
- afx_msg void OnSetupTerminal();
- afx_msg void OnSetupWindow();
- afx_msg void OnSetupFont();
- afx_msg void OnSetupDlgFont();
- afx_msg void OnSetupKeyboard();
- afx_msg void OnSetupSerialPort();
- afx_msg void OnSetupTCPIP();
- afx_msg void OnSetupGeneral();
- afx_msg void OnSetupSave();
- afx_msg void OnSetupRestore();
- afx_msg void OnOpenSetupDirectory();
- afx_msg void OnSetupLoadKeyMap();
- afx_msg void OnControlResetTerminal();
- afx_msg void OnControlResetRemoteTitle();
- afx_msg void OnControlBroadcastCommand();
- afx_msg void OnControlAreYouThere();
- afx_msg void OnControlSendBreak();
- afx_msg void OnControlResetPort();
- afx_msg void OnControlOpenTEK();
- afx_msg void OnControlCloseTEK();
- afx_msg void OnControlMacro();
- afx_msg void OnShowMacroWindow();
- afx_msg void OnWindowWindow();
- afx_msg void OnWindowMinimizeAll();
- afx_msg void OnWindowCascade();
- afx_msg void OnWindowStacked();
- afx_msg void OnWindowSidebySide();
- afx_msg void OnWindowRestoreAll();
- afx_msg void OnWindowUndo();
- afx_msg void OnHelpIndex();
-// afx_msg void OnHelpUsing(); // \x8E\xC0\x91̂Ȃ\xB5\x95s\x97v
- afx_msg void OnHelpAbout();
- afx_msg LRESULT OnDropNotify(WPARAM ShowMenu, LPARAM lParam);
- afx_msg LRESULT OnDpiChanged(WPARAM wParam, LPARAM lParam);
- //}}AFX_MSG
-// DECLARE_MESSAGE_MAP();
-#undef afx_msg
+ LRESULT OnIMEStartComposition(WPARAM wParam, LPARAM lParam);
+ LRESULT OnIMEEndComposition(WPARAM wParam, LPARAM lParam);
+ LRESULT OnIMEComposition(UINT wParam, LONG lParam);
+ LRESULT OnIMEInputChange(WPARAM wParam, LPARAM lParam);
+ LRESULT OnIMENotify(WPARAM wParam, LPARAM lParam);
+ LRESULT OnIMERequest(WPARAM wParam, LPARAM lParam);
+ LRESULT OnAccelCommand(WPARAM wParam, LPARAM lParam);
+ LRESULT OnChangeMenu(WPARAM wParam, LPARAM lParam);
+ LRESULT OnChangeTBar(WPARAM wParam, LPARAM lParam);
+ LRESULT OnCommNotify(WPARAM wParam, LPARAM lParam);
+ LRESULT OnCommOpen(WPARAM wParam, LPARAM lParam);
+ LRESULT OnCommStart(WPARAM wParam, LPARAM lParam);
+ LRESULT OnDdeEnd(WPARAM wParam, LPARAM lParam);
+ LRESULT OnDlgHelp(WPARAM wParam, LPARAM lParam);
+ LRESULT OnFileTransEnd(WPARAM wParam, LPARAM lParam);
+ LRESULT OnGetSerialNo(WPARAM wParam, LPARAM lParam);
+ LRESULT OnKeyCode(WPARAM wParam, LPARAM lParam);
+ LRESULT OnProtoEnd(WPARAM wParam, LPARAM lParam);
+ LRESULT OnChangeTitle(WPARAM wParam, LPARAM lParam);
+ LRESULT OnReceiveIpcMessage(WPARAM wParam, LPARAM lParam);
+ LRESULT OnNonConfirmClose(WPARAM wParam, LPARAM lParam);
+ LRESULT OnNotifyIcon(WPARAM wParam, LPARAM lParam);
+ void OnFileNewConnection();
+ void OnDuplicateSession();
+ void OnCygwinConnection();
+ void OnTTMenuLaunch();
+ void OnLogMeInLaunch();
+ void OnFileLog();
+ void OnCommentToLog();
+ void OnViewLog();
+ void OnShowLogDialog();
+ void OnReplayLog();
+ void OnExternalSetup();
+ void OnFileSend();
+ void OnFileKermitRcv();
+ void OnFileKermitGet();
+ void OnFileKermitSend();
+ void OnFileKermitFinish();
+ void OnFileXRcv();
+ void OnFileXSend();
+ void OnFileYRcv();
+ void OnFileYSend();
+ void OnFileZRcv();
+ void OnFileZSend();
+ void OnFileBPRcv();
+ void OnFileBPSend();
+ void OnFileQVRcv();
+ void OnFileQVSend();
+ void OnFileChangeDir();
+ void OnFilePrint();
+ void OnFileDisconnect();
+ void OnFileExit();
+ void OnEditCopy();
+ void OnEditCopyTable();
+ void OnEditPaste();
+ void OnEditPasteCR();
+ void OnEditClearScreen();
+ void OnEditClearBuffer();
+ void OnEditCancelSelection();
+ void OnEditSelectScreenBuffer();
+ void OnEditSelectAllBuffer();
+ void OnSetupTerminal();
+ void OnSetupWindow();
+ void OnSetupFont();
+ void OnSetupDlgFont();
+ void OnSetupKeyboard();
+ void OnSetupSerialPort();
+ void OnSetupTCPIP();
+ void OnSetupGeneral();
+ void OnSetupSave();
+ void OnSetupRestore();
+ void OnOpenSetupDirectory();
+ void OnSetupLoadKeyMap();
+ void OnControlResetTerminal();
+ void OnControlResetRemoteTitle();
+ void OnControlBroadcastCommand();
+ void OnControlAreYouThere();
+ void OnControlSendBreak();
+ void OnControlResetPort();
+ void OnControlOpenTEK();
+ void OnControlCloseTEK();
+ void OnControlMacro();
+ void OnShowMacroWindow();
+ void OnWindowWindow();
+ void OnWindowMinimizeAll();
+ void OnWindowCascade();
+ void OnWindowStacked();
+ void OnWindowSidebySide();
+ void OnWindowRestoreAll();
+ void OnWindowUndo();
+ void OnHelpIndex();
+ void OnHelpAbout();
+ LRESULT OnDropNotify(WPARAM ShowMenu, LPARAM lParam);
+ LRESULT OnDpiChanged(WPARAM wParam, LPARAM lParam);
void Disconnect(BOOL confirm);
- ///
virtual LRESULT Proc(UINT msg, WPARAM wp, LPARAM lp);
};
#endif