diff options
| author | George Hazan <ghazan@miranda.im> | 2019-02-27 12:43:20 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-02-27 12:43:20 +0300 |
| commit | 423be683866fd8e305457eb725d8cdbe1f297fbd (patch) | |
| tree | c49a7bdaf7f08683b9bfae48f0250050b2bf1872 /plugins/AvatarHistory/src | |
| parent | 288a07c81370226937d882b7a14fe3b6e3607e9e (diff) | |
popup code cleaning (cause we have no tchar.h)
Diffstat (limited to 'plugins/AvatarHistory/src')
| -rw-r--r-- | plugins/AvatarHistory/src/options.cpp | 2 | ||||
| -rw-r--r-- | plugins/AvatarHistory/src/popup.cpp | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/plugins/AvatarHistory/src/options.cpp b/plugins/AvatarHistory/src/options.cpp index 900bdf1c7a..e0ee99b963 100644 --- a/plugins/AvatarHistory/src/options.cpp +++ b/plugins/AvatarHistory/src/options.cpp @@ -154,7 +154,7 @@ int OptInit(WPARAM wParam, LPARAM) odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
g_plugin.addOptions(wParam, &odp);
- if (ServiceExists(MS_POPUP_ADDPOPUPT)) {
+ if (ServiceExists(MS_POPUP_ADDPOPUPW)) {
odp.szGroup.w = LPGENW("Popups");
odp.szTitle.w = LPGENW("Avatar change");
odp.pfnDlgProc = PopupsDlgProc;
diff --git a/plugins/AvatarHistory/src/popup.cpp b/plugins/AvatarHistory/src/popup.cpp index fad9b3c33a..e45c2aa43b 100644 --- a/plugins/AvatarHistory/src/popup.cpp +++ b/plugins/AvatarHistory/src/popup.cpp @@ -90,9 +90,9 @@ PopupDataType; void ShowPopupEx(MCONTACT hContact, const wchar_t *title, const wchar_t *description,
void *plugin_data, int type, const Options *op)
{
- if (ServiceExists(MS_POPUP_ADDPOPUPT)) {
+ if (ServiceExists(MS_POPUP_ADDPOPUPW)) {
// Make popup
- POPUPDATAT ppd = { 0 };
+ POPUPDATAW ppd = { 0 };
ppd.lchContact = hContact;
ppd.lchIcon = createProtoOverlayedIcon(hContact);
@@ -102,12 +102,12 @@ void ShowPopupEx(MCONTACT hContact, const wchar_t *title, const wchar_t *descrip ((PopupDataType*)ppd.PluginData)->hIcon = ppd.lchIcon;
if (title != nullptr)
- mir_wstrncpy(ppd.lptzContactName, title, _countof(ppd.lptzContactName));
+ mir_wstrncpy(ppd.lpwzContactName, title, _countof(ppd.lpwzContactName));
else if (hContact != NULL)
- mir_wstrncpy(ppd.lptzContactName, Clist_GetContactDisplayName(hContact), _countof(ppd.lptzContactName));
+ mir_wstrncpy(ppd.lpwzContactName, Clist_GetContactDisplayName(hContact), _countof(ppd.lpwzContactName));
if (description != nullptr)
- mir_wstrncpy(ppd.lptzText, description, _countof(ppd.lptzText));
+ mir_wstrncpy(ppd.lpwzText, description, _countof(ppd.lpwzText));
if (type == POPUP_TYPE_NORMAL || type == POPUP_TYPE_TEST) {
if (op->popup_use_default_colors) {
@@ -159,7 +159,7 @@ void ShowPopupEx(MCONTACT hContact, const wchar_t *title, const wchar_t *descrip }
// Now that every field has been filled, we want to see the popup.
- PUAddPopupT(&ppd);
+ PUAddPopupW(&ppd);
}
else {
MessageBox(nullptr, description, title ? title : Clist_GetContactDisplayName(hContact), MB_OK);
|