Revision: 8951 https://osdn.net/projects/ttssh2/scm/svn/commits/8951 Author: zmatsuo Date: 2020-10-03 00:46:55 +0900 (Sat, 03 Oct 2020) Log Message: ----------- 不要なincludeファイルを削除 - addsetting.cpp から ttftypes.h を削除 - enum rotate_mode を ttftypes.h から tttypes.h へ移動 Modified Paths: -------------- trunk/teraterm/common/ttftypes.h trunk/teraterm/common/tttypes.h trunk/teraterm/teraterm/addsetting.cpp -------------- next part -------------- Modified: trunk/teraterm/common/ttftypes.h =================================================================== --- trunk/teraterm/common/ttftypes.h 2020-10-02 15:46:44 UTC (rev 8950) +++ trunk/teraterm/common/ttftypes.h 2020-10-02 15:46:55 UTC (rev 8951) @@ -89,12 +89,6 @@ #define TitQVRcv "Quick-VAN Receive" #define TitQVSend "Quick-VAN Send" -// log rotate mode -enum rotate_mode { - ROTATE_NONE, - ROTATE_SIZE -}; - typedef struct { HWND HMainWin; HWND HWin; Modified: trunk/teraterm/common/tttypes.h =================================================================== --- trunk/teraterm/common/tttypes.h 2020-10-02 15:46:44 UTC (rev 8950) +++ trunk/teraterm/common/tttypes.h 2020-10-02 15:46:55 UTC (rev 8951) @@ -195,6 +195,12 @@ // LogDialog Option #define LOGDLG_BINARY 1 +// log rotate mode +enum rotate_mode { + ROTATE_NONE, + ROTATE_SIZE +}; + // Log Timestamp Type enum LogTimestampType { TIMESTAMP_LOCAL, Modified: trunk/teraterm/teraterm/addsetting.cpp =================================================================== --- trunk/teraterm/teraterm/addsetting.cpp 2020-10-02 15:46:44 UTC (rev 8950) +++ trunk/teraterm/teraterm/addsetting.cpp 2020-10-02 15:46:55 UTC (rev 8951) @@ -44,7 +44,6 @@ #include "tttypes.h" #include "ttwinman.h" // for ts #include "ttcommon.h" -#include "ttftypes.h" #include "dlglib.h" #include "compat_win.h" #include "helpid.h" @@ -322,7 +321,7 @@ { switch (wParam) { case IDC_ACCEPT_MOUSE_EVENT_TRACKING | (BN_CLICKED << 16): - EnableDlgItem(IDC_DISABLE_MOUSE_TRACKING_CTRL, + EnableDlgItem(IDC_DISABLE_MOUSE_TRACKING_CTRL, GetCheck(IDC_ACCEPT_MOUSE_EVENT_TRACKING) ? TRUE : FALSE); return TRUE; } @@ -1111,7 +1110,7 @@ GetDlgItemTextA(IDC_ALPHA_BLEND_INACTIVE, buf, sizeof(buf)); if (isdigit(buf[0])) { int i = atoi(buf); - ts.AlphaBlendInactive = + ts.AlphaBlendInactive = (i < 0) ? 0 : (i > 255) ? 255 : i; } @@ -1132,7 +1131,7 @@ GetDlgItemTextA(IDC_EDIT_BGIMG_BRIGHTNESS, buf, sizeof(buf)); if (isdigit(buf[0])) { int i = atoi(buf); - ts.BGImgBrightness = + ts.BGImgBrightness = (i < 0) ? 0 : (i > 255) ? 255 : i; } @@ -1801,4 +1800,3 @@ gTTCPS = this; return _PropertySheetW(&m_psh); } -