From e521b812384a0e93f48e078c6cb248913dcc893a Mon Sep 17 00:00:00 2001
From: Vadim Dashevskiy <watcherhd@gmail.com>
Date: Fri, 15 Jun 2012 20:04:13 +0000
Subject: another portion of "#ifsef Unicode" removal

git-svn-id: http://svn.miranda-ng.org/main/trunk@437 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/SmileyAdd/general.cpp | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

(limited to 'plugins/SmileyAdd/general.cpp')

diff --git a/plugins/SmileyAdd/general.cpp b/plugins/SmileyAdd/general.cpp
index 03164e5c44..9e97737f8c 100644
--- a/plugins/SmileyAdd/general.cpp
+++ b/plugins/SmileyAdd/general.cpp
@@ -26,9 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /*
 #include "m_popup.h"
-#if defined _UNICODE || defined UNICODE
-#include "m_popupw.h"
-#endif
 */
 static ULONG_PTR g_gdiplusToken = 0;
 static bool gdiPlusFail = false;
@@ -278,22 +275,18 @@ void ReportError(const TCHAR* errmsg)
 {
 	static const TCHAR title[] = _T("Miranda SmileyAdd");
 /*
-#if defined _UNICODE || defined UNICODE
+
 	POPUPDATAW pd = {0};
-#else
-	POPUPDATAEX pd = {0};
-#endif
+
 
 	_tcscpy(pd.lpwzContactName, title);
 	_tcscpy(pd.lpwzText, errmsg);
 
 	pd.iSeconds = -1;
 
-#if defined _UNICODE || defined UNICODE
+
 	bool popupFail = PUAddPopUpW(&pd)  != CALLSERVICE_NOTFOUND;
-#else
-	bool popupFail = PUAddPopUpEx(&pd) != CALLSERVICE_NOTFOUND;
-#endif
+
 	if (popupFail)
 */		
 		MessageBox(NULL, errmsg, title, MB_OK | MB_ICONWARNING | MB_TOPMOST);
@@ -302,14 +295,5 @@ void ReportError(const TCHAR* errmsg)
 #pragma warning( disable : 4786 )
 #undef _MT
 
-#if defined _UNICODE || defined UNICODE
-
 #include <wcpattern.cpp>
 #include <wcmatcher.cpp>
-
-#else
-
-#include <pattern.cpp>
-#include <matcher.cpp>
-
-#endif
-- 
cgit v1.2.3