From 58973a21a30bf95427fd43c456e41e35c386218c Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Fri, 15 Jun 2012 18:52:16 +0000 Subject: another portion of "#ifsef Unicode" removal git-svn-id: http://svn.miranda-ng.org/main/trunk@434 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/MenuItemEx/main.c | 13 ++++--------- plugins/MenuItemEx/version.h | 4 ---- 2 files changed, 4 insertions(+), 13 deletions(-) (limited to 'plugins/MenuItemEx') 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); diff --git a/plugins/MenuItemEx/version.h b/plugins/MenuItemEx/version.h index 07b9cf78ef..59d1c2358c 100644 --- a/plugins/MenuItemEx/version.h +++ b/plugins/MenuItemEx/version.h @@ -10,10 +10,6 @@ #define __PLUGIN_NAME "MenuItemEx (Unicode) plugin for Miranda IM" #define __PLUGIN_ID 4036 #define __PLUGIN_ID_STR "4036" -#else -#define __PLUGIN_NAME "MenuItemEx plugin for Miranda IM" -#define __PLUGIN_ID 4303 -#define __PLUGIN_ID_STR "4303" #endif #define __WEB "http://addons.miranda-im.org/details.php?action=viewfile&id=" -- cgit v1.2.3