diff options
author | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-15 18:52:16 +0000 |
---|---|---|
committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-15 18:52:16 +0000 |
commit | 58973a21a30bf95427fd43c456e41e35c386218c (patch) | |
tree | 1413fba069ecd351b2c99fa5a53e52c68d8a662c /plugins/MenuItemEx/main.c | |
parent | 55b5cf8a5506f03350e5c80ac86f5717425e4d10 (diff) |
another portion of "#ifsef Unicode" removal
git-svn-id: http://svn.miranda-ng.org/main/trunk@434 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/MenuItemEx/main.c')
-rw-r--r-- | plugins/MenuItemEx/main.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/plugins/MenuItemEx/main.c b/plugins/MenuItemEx/main.c index 537d277262..8c65f0a8bc 100644 --- a/plugins/MenuItemEx/main.c +++ b/plugins/MenuItemEx/main.c @@ -314,11 +314,9 @@ void CopyToClipboard(HWND hwnd,LPSTR pszMsg, LPTSTR ptszMsg) OpenClipboard(NULL);
EmptyClipboard();
-#ifdef _UNICODE
+
SetClipboardData(CF_UNICODETEXT, hglbCopy);
-#else
- SetClipboardData(CF_TEXT, hglbCopy);
-#endif
+
CloseClipboard();
}
@@ -500,7 +498,7 @@ INT_PTR CALLBACK AuthReqWndProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam) case IDOK:
{
char szReason[256] = {0};
-#ifdef _UNICODE
+
WCHAR wszReason[256] = {0};
if (CallService(MS_SYSTEM_GETVERSION, 0, 0) < 0x00090007)
@@ -513,10 +511,7 @@ INT_PTR CALLBACK AuthReqWndProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam) GetDlgItemText(hdlg,IDC_REASON,wszReason,255);
CallContactService(hcontact,PSS_AUTHREQUESTW,0,(LPARAM)wszReason);
}
-#else
- GetDlgItemTextA(hdlg,IDC_REASON,szReason,255);
- CallContactService(hcontact,PSS_AUTHREQUEST,0,(LPARAM)szReason);
-#endif
+
} // fall through
case IDCANCEL:
DestroyWindow(hdlg);
|