diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-03-02 12:37:59 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-03-02 12:37:59 +0000 |
| commit | 95c0985670fefbe446908ebaef98dc2559f8d9fc (patch) | |
| tree | 860222f71ee032b1950e8eac8f395249cc3c693f /plugins/Scriver | |
| parent | 71eabf9174e4829e85d84f1098ef0d70b3674300 (diff) | |
rest of TCHAR_STR_PARAM replaced
git-svn-id: http://svn.miranda-ng.org/main/trunk@3831 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Scriver')
| -rw-r--r-- | plugins/Scriver/src/chat/log.cpp | 6 | ||||
| -rw-r--r-- | plugins/Scriver/src/chat/tools.cpp | 2 | ||||
| -rw-r--r-- | plugins/Scriver/src/msglog.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/plugins/Scriver/src/chat/log.cpp b/plugins/Scriver/src/chat/log.cpp index 7b886c0ee3..24983d2c4b 100644 --- a/plugins/Scriver/src/chat/log.cpp +++ b/plugins/Scriver/src/chat/log.cpp @@ -882,9 +882,9 @@ char * Log_CreateRtfHeader(MODULEINFO * mi, SESSION_INFO* si) // font table
AppendToBuffer(&buffer, &bufferEnd, &bufferAlloced, "{\\rtf1\\ansi\\deff0{\\fonttbl");
- for (i = 0; i < OPTIONS_FONTCOUNT; i++) {
- AppendToBuffer(&buffer, &bufferEnd, &bufferAlloced, "{\\f%u\\fnil\\fcharset%u" TCHAR_STR_PARAM ";}", i, (!forceCharset) ? aFonts[i].lf.lfCharSet : charset, aFonts[i].lf.lfFaceName);
- }
+ for (i = 0; i < OPTIONS_FONTCOUNT; i++)
+ AppendToBuffer(&buffer, &bufferEnd, &bufferAlloced, "{\\f%u\\fnil\\fcharset%u%S;}", i, (!forceCharset) ? aFonts[i].lf.lfCharSet : charset, aFonts[i].lf.lfFaceName);
+
// colour table
AppendToBuffer(&buffer, &bufferEnd, &bufferAlloced, "}{\\colortbl ;");
diff --git a/plugins/Scriver/src/chat/tools.cpp b/plugins/Scriver/src/chat/tools.cpp index 0eda0e0b52..6fa6592bcc 100644 --- a/plugins/Scriver/src/chat/tools.cpp +++ b/plugins/Scriver/src/chat/tools.cpp @@ -129,7 +129,7 @@ static int ShowPopup (HANDLE hContact, SESSION_INFO* si, HICON hIcon, char* psz else
pd.lchIcon = GetCachedIcon("chat_window");
- mir_sntprintf(pd.lptzContactName, MAX_CONTACTNAME-1, _T(TCHAR_STR_PARAM) _T(" - %s"),
+ mir_sntprintf(pd.lptzContactName, MAX_CONTACTNAME-1, _T("%S - %s"),
pszProtoName, CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR ));
lstrcpyn( pd.lptzText, TranslateTS(szBuf), MAX_SECONDLINE-1);
pd.iSeconds = g_Settings.iPopupTimeout;
diff --git a/plugins/Scriver/src/msglog.cpp b/plugins/Scriver/src/msglog.cpp index 8e2051761f..6bd33e9264 100644 --- a/plugins/Scriver/src/msglog.cpp +++ b/plugins/Scriver/src/msglog.cpp @@ -386,7 +386,7 @@ static char *CreateRTFHeader(struct SrmmWindowData *dat, struct GlobalMessageDat AppendToBuffer(&buffer, &bufferEnd, &bufferAlloced, "{\\rtf1\\ansi\\deff0{\\fonttbl");
for (i = 0; i < fontOptionsListSize; i++) {
LoadMsgDlgFont(i, &lf, NULL, FALSE);
- AppendToBuffer(&buffer, &bufferEnd, &bufferAlloced, "{\\f%u\\fnil\\fcharset%u " TCHAR_STR_PARAM ";}", i,
+ AppendToBuffer(&buffer, &bufferEnd, &bufferAlloced, "{\\f%u\\fnil\\fcharset%u %S;}", i,
(!forceCharset) ? lf.lfCharSet : charset, lf.lfFaceName);
}
AppendToBuffer(&buffer, &bufferEnd, &bufferAlloced, "}{\\colortbl ");
|