summaryrefslogtreecommitdiff
path: root/plugins/YAPP/popup_history_dlg.cpp
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2012-06-16 14:51:46 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2012-06-16 14:51:46 +0000
commit8617d7e00546f892c9084f7c382648b23d8bbb63 (patch)
tree2be51254236644b678418c1147f223a30e030bda /plugins/YAPP/popup_history_dlg.cpp
parent05c989e58aeffcfb59cebaca6797cb69dd25cb1e (diff)
another portion of "#ifdef Unicode" removal
git-svn-id: http://svn.miranda-ng.org/main/trunk@447 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/YAPP/popup_history_dlg.cpp')
-rw-r--r--plugins/YAPP/popup_history_dlg.cpp13
1 files changed, 4 insertions, 9 deletions
diff --git a/plugins/YAPP/popup_history_dlg.cpp b/plugins/YAPP/popup_history_dlg.cpp
index fda95893d9..e192139c8a 100644
--- a/plugins/YAPP/popup_history_dlg.cpp
+++ b/plugins/YAPP/popup_history_dlg.cpp
@@ -336,14 +336,11 @@ IEVIEWEVENTDATA *CreateAndFillEventData(PopupHistoryData *popupItem)
{
eventData->cbSize = sizeof(IEVIEWEVENTDATA);
eventData->iType = IEED_EVENT_MESSAGE;
-#ifdef UNICODE
+
eventData->dwFlags = IEEDF_UNICODE_NICK | IEEDF_UNICODE_TEXT | IEEDF_UNICODE_TEXT2;
eventData->pszNickW = popupItem->titleT;
eventData->pszTextW = popupItem->messageT;
-#else
- eventData->pszNick = popupItem->titleT;
- eventData->pszText = popupItem->messageT;
-#endif
+
eventData->time = (DWORD) popupItem->timestamp;
eventData->next = NULL;
}
@@ -479,11 +476,9 @@ void CopyPopupDataToClipboard(HWND hList, int selection)
int found = 0;
int count = ListView_GetItemCount(hList);
int textType;
-#ifdef _UNICODE
+
textType = CF_UNICODETEXT;
-#else
- textType = CF_TEXT;
-#endif
+
for (i = 0; i < count; i++)
{