Tera TermRevision: 8578
https://osdn.net/projects/ttssh2/scm/svn/commits/8578
Author: zmatsuo
Date: 2020-03-08 00:13:00 +0900 (Sun, 08 Mar 2020)
Log Message:
-----------
ttpmenu でビルド時の警告を出ないようにした
- UTIL_get_lang_msg(), UTIL_get_lang_font() の引数に const を追加
- ISO C++ forbids converting a string constant to 'PCHAR' {aka 'char*'}
Modified Paths:
--------------
trunk/ttpmenu/winmisc.cpp
trunk/ttpmenu/winmisc.h
-------------- next part --------------
Modified: trunk/ttpmenu/winmisc.cpp
===================================================================
--- trunk/ttpmenu/winmisc.cpp 2020-03-07 15:12:50 UTC (rev 8577)
+++ trunk/ttpmenu/winmisc.cpp 2020-03-07 15:13:00 UTC (rev 8578)
@@ -442,12 +442,12 @@
return ret;
}
-void UTIL_get_lang_msg(PCHAR key, PCHAR buf, int buf_len, PCHAR def, PCHAR iniFile)
+void UTIL_get_lang_msg(const char *key, PCHAR buf, int buf_len, const char *def, const char *iniFile)
{
GetI18nStr("TTMenu", key, buf, buf_len, def, iniFile);
}
-int UTIL_get_lang_font(PCHAR key, HWND dlg, PLOGFONT logfont, HFONT *font, PCHAR iniFile)
+int UTIL_get_lang_font(const char *key, HWND dlg, PLOGFONT logfont, HFONT *font, const char *iniFile)
{
if (GetI18nLogfont("TTMenu", key, logfont,
GetDeviceCaps(GetDC(dlg),LOGPIXELSY),
Modified: trunk/ttpmenu/winmisc.h
===================================================================
--- trunk/ttpmenu/winmisc.h 2020-03-07 15:12:50 UTC (rev 8577)
+++ trunk/ttpmenu/winmisc.h 2020-03-07 15:13:00 UTC (rev 8578)
@@ -63,8 +63,8 @@
int CALLBACK BrowseCallbackProc(HWND hWnd, UINT uMsg, LPARAM lParam, LPARAM lpData);
TCHAR *PathTok(TCHAR *str, TCHAR *separator);
TCHAR *lstrstri(TCHAR *s1, TCHAR *s2);
-void UTIL_get_lang_msg(PCHAR key, PCHAR buf, int buf_len, PCHAR def, PCHAR iniFile);
-int UTIL_get_lang_font(PCHAR key, HWND dlg, PLOGFONT logfont, HFONT *font, PCHAR iniFile);
+void UTIL_get_lang_msg(const char *key, PCHAR buf, int buf_len, const char *def, const char *iniFile);
+int UTIL_get_lang_font(const char *key, HWND dlg, PLOGFONT logfont, HFONT *font, const char *iniFile);
LRESULT CALLBACK password_wnd_proc(HWND control, UINT msg,
WPARAM wParam, LPARAM lParam);