Tera TermRevision: 8657
https://osdn.net/projects/ttssh2/scm/svn/commits/8657
Author: zmatsuo
Date: 2020-03-31 00:19:35 +0900 (Tue, 31 Mar 2020)
Log Message:
-----------
tchar.h を include しない
Modified Paths:
--------------
branches/unicode_macro_2/teraterm/ttpmacro/ListDlg.cpp
branches/unicode_macro_2/teraterm/ttpmacro/errdlg.cpp
branches/unicode_macro_2/teraterm/ttpmacro/ttl_gui.cpp
branches/unicode_macro_2/teraterm/ttpmacro/ttmdlg.cpp
-------------- next part --------------
Modified: branches/unicode_macro_2/teraterm/ttpmacro/ListDlg.cpp
===================================================================
--- branches/unicode_macro_2/teraterm/ttpmacro/ListDlg.cpp 2020-03-30 15:19:27 UTC (rev 8656)
+++ branches/unicode_macro_2/teraterm/ttpmacro/ListDlg.cpp 2020-03-30 15:19:35 UTC (rev 8657)
@@ -29,7 +29,6 @@
// ListDlg.cpp : \x8E\xC0\x91\x95\x83t\x83@\x83C\x83\x8B
//
-#include <tchar.h>
#include "tmfc.h"
#include "teraterm.h"
#include "ttlib.h"
@@ -72,7 +71,7 @@
SIZE size;
int ListWidth;
SendDlgItemMessageW(IDC_LISTBOX, LB_ADDSTRING, 0, (LPARAM)(*p));
- GetTextExtentPoint32W(DC, *p, wcslen(*p), &size);
+ GetTextExtentPoint32W(DC, *p, (int)wcslen(*p), &size);
ListWidth = size.cx;
if (ListWidth > ListMaxWidth) {
ListMaxWidth = ListWidth;
Modified: branches/unicode_macro_2/teraterm/ttpmacro/errdlg.cpp
===================================================================
--- branches/unicode_macro_2/teraterm/ttpmacro/errdlg.cpp 2020-03-30 15:19:27 UTC (rev 8656)
+++ branches/unicode_macro_2/teraterm/ttpmacro/errdlg.cpp 2020-03-30 15:19:35 UTC (rev 8657)
@@ -31,7 +31,6 @@
#include <windowsx.h>
#include <stdio.h>
-#include <tchar.h>
#include "tmfc.h"
#include "teraterm.h"
#include "ttlib.h"
Modified: branches/unicode_macro_2/teraterm/ttpmacro/ttl_gui.cpp
===================================================================
--- branches/unicode_macro_2/teraterm/ttpmacro/ttl_gui.cpp 2020-03-30 15:19:27 UTC (rev 8656)
+++ branches/unicode_macro_2/teraterm/ttpmacro/ttl_gui.cpp 2020-03-30 15:19:35 UTC (rev 8657)
@@ -294,7 +294,7 @@
GetAbsPath(Str,sizeof(Str));
_GetPrivateProfileStringW(L"Password", (wc)Str2, L"",
- Temp, _countof(Temp), wc::fromUtf8(Str));
+ Temp, _countof(Temp), (wc)Str);
if (Temp[0]==0) // password not exist
{
wchar_t input_string[MaxStrLen];
Modified: branches/unicode_macro_2/teraterm/ttpmacro/ttmdlg.cpp
===================================================================
--- branches/unicode_macro_2/teraterm/ttpmacro/ttmdlg.cpp 2020-03-30 15:19:27 UTC (rev 8656)
+++ branches/unicode_macro_2/teraterm/ttpmacro/ttmdlg.cpp 2020-03-30 15:19:35 UTC (rev 8657)
@@ -37,7 +37,6 @@
#endif
#include <stdlib.h>
#include <crtdbg.h>
-#include <tchar.h>
#include <assert.h>
#include "teraterm.h"