From 428bf0cbd77813a43094cb5c984436deff251936 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 29 Jul 2016 12:36:34 +0000 Subject: no more TCHARs git-svn-id: http://svn.miranda-ng.org/main/trunk@17143 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Alarms/src/alarm_win.cpp | 22 +++++++++++----------- plugins/Alarms/src/alarmlist.cpp | 16 ++++++++-------- plugins/Alarms/src/frame.cpp | 2 +- 3 files changed, 20 insertions(+), 20 deletions(-) (limited to 'plugins/Alarms/src') diff --git a/plugins/Alarms/src/alarm_win.cpp b/plugins/Alarms/src/alarm_win.cpp index 4052bc7f79..5dfe6730cb 100644 --- a/plugins/Alarms/src/alarm_win.cpp +++ b/plugins/Alarms/src/alarm_win.cpp @@ -6,8 +6,8 @@ #define SPEACH_REPEAT_PERIOD 15000 // milliseconds MWindowList hAlarmWindowList = 0; -FontIDT title_font_id, window_font_id; -ColourIDT bk_colour_id; +FontIDW title_font_id, window_font_id; +ColourIDW bk_colour_id; HFONT hTitleFont = 0, hWindowFont = 0; COLORREF title_font_colour, window_font_colour; HBRUSH hBackgroundBrush = 0; @@ -331,15 +331,15 @@ INT_PTR CALLBACK DlgProcAlarm(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar int ReloadFonts(WPARAM, LPARAM) { LOGFONT log_font; - title_font_colour = CallService(MS_FONT_GETT, (WPARAM)&title_font_id, (LPARAM)&log_font); + title_font_colour = CallService(MS_FONT_GETW, (WPARAM)&title_font_id, (LPARAM)&log_font); DeleteObject(hTitleFont); hTitleFont = CreateFontIndirect(&log_font); - window_font_colour = CallService(MS_FONT_GETT, (WPARAM)&window_font_id, (LPARAM)&log_font); + window_font_colour = CallService(MS_FONT_GETW, (WPARAM)&window_font_id, (LPARAM)&log_font); DeleteObject(hWindowFont); hWindowFont = CreateFontIndirect(&log_font); - COLORREF bkCol = CallService(MS_COLOUR_GETT, (WPARAM)&bk_colour_id, 0); + COLORREF bkCol = CallService(MS_COLOUR_GETW, (WPARAM)&bk_colour_id, 0); DeleteObject(hBackgroundBrush); hBackgroundBrush = CreateSolidBrush(bkCol); @@ -349,7 +349,7 @@ int ReloadFonts(WPARAM, LPARAM) int AlarmWinModulesLoaded(WPARAM, LPARAM) { - title_font_id.cbSize = sizeof(FontIDT); + title_font_id.cbSize = sizeof(FontIDW); mir_wstrcpy(title_font_id.group, LPGENW("Alarms")); mir_wstrcpy(title_font_id.name, LPGENW("Title")); mir_strcpy(title_font_id.dbSettingsGroup, MODULE); @@ -358,9 +358,9 @@ int AlarmWinModulesLoaded(WPARAM, LPARAM) mir_wstrcpy(title_font_id.backgroundName, LPGENW("Background")); title_font_id.flags = 0; title_font_id.order = 0; - FontRegisterT(&title_font_id); + FontRegisterW(&title_font_id); - window_font_id.cbSize = sizeof(FontIDT); + window_font_id.cbSize = sizeof(FontIDW); mir_wstrcpy(window_font_id.group, LPGENW("Alarms")); mir_wstrcpy(window_font_id.name, LPGENW("Window")); mir_strcpy(window_font_id.dbSettingsGroup, MODULE); @@ -369,9 +369,9 @@ int AlarmWinModulesLoaded(WPARAM, LPARAM) mir_wstrcpy(window_font_id.backgroundName, LPGENW("Background")); window_font_id.flags = 0; window_font_id.order = 1; - FontRegisterT(&window_font_id); + FontRegisterW(&window_font_id); - bk_colour_id.cbSize = sizeof(ColourIDT); + bk_colour_id.cbSize = sizeof(ColourIDW); mir_strcpy(bk_colour_id.dbSettingsGroup, MODULE); mir_wstrcpy(bk_colour_id.group, LPGENW("Alarms")); mir_wstrcpy(bk_colour_id.name, LPGENW("Background")); @@ -380,7 +380,7 @@ int AlarmWinModulesLoaded(WPARAM, LPARAM) bk_colour_id.flags = 0; bk_colour_id.order = 0; - ColourRegisterT(&bk_colour_id); + ColourRegisterW(&bk_colour_id); ReloadFonts(0, 0); HookEvent(ME_FONT_RELOAD, ReloadFonts); diff --git a/plugins/Alarms/src/alarmlist.cpp b/plugins/Alarms/src/alarmlist.cpp index e108e04132..cc41317231 100644 --- a/plugins/Alarms/src/alarmlist.cpp +++ b/plugins/Alarms/src/alarmlist.cpp @@ -190,12 +190,12 @@ void LoadAlarms() { memset(&alarm, 0, sizeof(ALARM)); mir_snprintf(buff, "Title%d", i); - if (!db_get_ts(0, MODULE, buff, &dbv)) { + if (!db_get_ws(0, MODULE, buff, &dbv)) { alarm.szTitle = mir_wstrdup(dbv.ptszVal); db_free(&dbv); } mir_snprintf(buff, "Desc%d", i); - if (!db_get_ts(0, MODULE, buff, &dbv)) { + if (!db_get_ws(0, MODULE, buff, &dbv)) { alarm.szDesc = mir_wstrdup(dbv.ptszVal); db_free(&dbv); } @@ -244,11 +244,11 @@ void LoadAlarms() { alarm.action = (unsigned short)db_get_dw(0, MODULE, buff, AAF_POPUP | AAF_SOUND); if (alarm.action & AAF_COMMAND) { mir_snprintf(buff, "ActionCommand%d", i); - if (!db_get_ts(0, MODULE, buff, &dbv)) { + if (!db_get_ws(0, MODULE, buff, &dbv)) { alarm.szCommand = mir_wstrdup(dbv.ptszVal); db_free(&dbv); mir_snprintf(buff, "ActionParams%d", i); - if (!db_get_ts(0, MODULE, buff, &dbv)) { + if (!db_get_ws(0, MODULE, buff, &dbv)) { alarm.szCommandParams = mir_wstrdup(dbv.ptszVal); db_free(&dbv); } @@ -289,9 +289,9 @@ void SaveAlarms() { ALARM *i; for(alarms.reset(); i = alarms.current(); alarms.next(), index++) { mir_snprintf(buff, "Title%d", index); - db_set_ts(0, MODULE, buff, i->szTitle); + db_set_ws(0, MODULE, buff, i->szTitle); mir_snprintf(buff, "Desc%d", index); - db_set_ts(0, MODULE, buff, i->szDesc); + db_set_ws(0, MODULE, buff, i->szDesc); mir_snprintf(buff, "Occ%d", index); db_set_w(0, MODULE, buff, i->occurrence); @@ -328,10 +328,10 @@ void SaveAlarms() { if (i->action & AAF_COMMAND) { if (mir_wstrlen(i->szCommand)) { mir_snprintf(buff, "ActionCommand%d", index); - db_set_ts(0, MODULE, buff, i->szCommand); + db_set_ws(0, MODULE, buff, i->szCommand); if (mir_wstrlen(i->szCommandParams)) { mir_snprintf(buff, "ActionParams%d", index); - db_set_ts(0, MODULE, buff, i->szCommandParams); + db_set_ws(0, MODULE, buff, i->szCommandParams); } } } diff --git a/plugins/Alarms/src/frame.cpp b/plugins/Alarms/src/frame.cpp index 7ad231858c..9fd38fb638 100644 --- a/plugins/Alarms/src/frame.cpp +++ b/plugins/Alarms/src/frame.cpp @@ -508,7 +508,7 @@ int CreateFrame() Frame.tname = TranslateT("Alarms"); Frame.hWnd = hwnd_plugin; Frame.align = alBottom; - Frame.Flags = F_TCHAR | F_VISIBLE | F_SHOWTB | F_SHOWTBTIP; + Frame.Flags = F_UNICODE | F_VISIBLE | F_SHOWTB | F_SHOWTBTIP; Frame.height = 30; Frame.hIcon = hIconMenuSet; frame_id = CallService(MS_CLIST_FRAMES_ADDFRAME,(WPARAM)&Frame,0); -- cgit v1.2.3