From 423be683866fd8e305457eb725d8cdbe1f297fbd Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 27 Feb 2019 12:43:20 +0300 Subject: popup code cleaning (cause we have no tchar.h) --- plugins/Exchange/src/dlg_handlers.cpp | 2 +- plugins/Exchange/src/emails.cpp | 10 +++++----- plugins/Exchange/src/utils.cpp | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'plugins/Exchange/src') diff --git a/plugins/Exchange/src/dlg_handlers.cpp b/plugins/Exchange/src/dlg_handlers.cpp index 8fd8a3e1c9..0b084374cc 100644 --- a/plugins/Exchange/src/dlg_handlers.cpp +++ b/plugins/Exchange/src/dlg_handlers.cpp @@ -58,7 +58,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara SetDlgItemInt(hWnd, IDC_RECONNECT_INTERVAL, g_plugin.getDword("ReconnectInterval", DEFAULT_RECONNECT_INTERVAL), FALSE); CheckDlgButton(hWnd, IDC_USE_POPUPS, (BOOL)g_plugin.getByte("UsePopups", 0) ? BST_CHECKED : BST_UNCHECKED); - EnableWindow(GetDlgItem(hWnd, IDC_USE_POPUPS), ServiceExists(MS_POPUP_ADDPOPUPT)); //disable the popups checkbox if no popup module is present + EnableWindow(GetDlgItem(hWnd, IDC_USE_POPUPS), ServiceExists(MS_POPUP_ADDPOPUPW)); //disable the popups checkbox if no popup module is present CheckDlgButton(hWnd, IDC_CHECK_EMAILS, (bCheck) ? BST_CHECKED : BST_UNCHECKED); EnableWindow(GetDlgItem(hWnd, IDC_INTERVAL_EDIT), bCheck); diff --git a/plugins/Exchange/src/emails.cpp b/plugins/Exchange/src/emails.cpp index dbf2e30884..58d0459db6 100644 --- a/plugins/Exchange/src/emails.cpp +++ b/plugins/Exchange/src/emails.cpp @@ -294,7 +294,7 @@ int CExchangeServer::Check(int bNoEmailsNotify) int ShowMessage(wchar_t *message, int cUnreadEmails) { - int usePopups = ServiceExists(MS_POPUP_ADDPOPUPT) ? g_plugin.getByte("UsePopups", 0) : 0; + int usePopups = ServiceExists(MS_POPUP_ADDPOPUPW) ? g_plugin.getByte("UsePopups", 0) : 0; if (usePopups) return ShowPopupMessage(TranslateT("Exchange email"), message, cUnreadEmails); @@ -303,16 +303,16 @@ int ShowMessage(wchar_t *message, int cUnreadEmails) int ShowPopupMessage(wchar_t *title, wchar_t *message, int cUnreadEmails) { - POPUPDATAT popup = {0}; + POPUPDATAW popup = {0}; popup.lchContact = NULL; popup.colorBack = NULL; popup.colorText = NULL; popup.lchIcon = hiMailIcon; - wcsncpy_s(popup.lptzContactName, MAX_CONTACTNAME, title, _TRUNCATE); - wcsncpy_s(popup.lptzText, MAX_SECONDLINE, message, _TRUNCATE); + wcsncpy_s(popup.lpwzContactName, MAX_CONTACTNAME, title, _TRUNCATE); + wcsncpy_s(popup.lpwzText, MAX_SECONDLINE, message, _TRUNCATE); popup.PluginWindowProc = DlgProcPopup; popup.PluginData = (int *) cUnreadEmails; - return PUAddPopupT(&popup); + return PUAddPopupW(&popup); } int ShowMessageBoxMessage(wchar_t *title, wchar_t *message, int cUnreadEmails) diff --git a/plugins/Exchange/src/utils.cpp b/plugins/Exchange/src/utils.cpp index 8874775373..b5459483ef 100644 --- a/plugins/Exchange/src/utils.cpp +++ b/plugins/Exchange/src/utils.cpp @@ -220,9 +220,9 @@ int ThreadCheckEmail(int bForceAttempt) void _popupUtil(wchar_t* szMsg) { - POPUPDATAT ppd = { 0 }; + POPUPDATAW ppd = { 0 }; ppd.lchIcon = hiMailIcon; - wcsncpy(ppd.lptzContactName, L"Exchange notifier", MAX_CONTACTNAME - 1); - wcsncpy(ppd.lptzText, szMsg, MAX_SECONDLINE - 1); - PUAddPopupT(&ppd); //show a popup to tell the user what we're doing. + wcsncpy(ppd.lpwzContactName, L"Exchange notifier", MAX_CONTACTNAME - 1); + wcsncpy(ppd.lpwzText, szMsg, MAX_SECONDLINE - 1); + PUAddPopupW(&ppd); //show a popup to tell the user what we're doing. } -- cgit v1.2.3