From 58973a21a30bf95427fd43c456e41e35c386218c Mon Sep 17 00:00:00 2001
From: Vadim Dashevskiy <watcherhd@gmail.com>
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/Popup/src/main.cpp | 67 ----------------------------------------------
 1 file changed, 67 deletions(-)

(limited to 'plugins/Popup/src/main.cpp')

diff --git a/plugins/Popup/src/main.cpp b/plugins/Popup/src/main.cpp
index debafada7a..268226de9c 100644
--- a/plugins/Popup/src/main.cpp
+++ b/plugins/Popup/src/main.cpp
@@ -553,73 +553,6 @@ MIRAPI int Load(PLUGINLINK *link)
 	osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
 	bResult = GetVersionEx(&osvi);
 
-// MLU layer for ansi release
-#if !defined(_UNICODE)
-	MySetLayeredWindowAttributes = 0;
-	MyUpdateLayeredWindow = 0;
-	MyAnimateWindow = 0;
-	MyDrawTextW = 0;
-	MyDrawTextExW = 0;
-	MySetWindowTextW = 0;
-	MySendMessageW = 0;
-	MyCallWindowProcW = 0;
-	MyCreateWindowExW = 0;
-
-	MyGetMonitorInfo = 0;
-	MyMonitorFromWindow = 0;
-
-	hUserDll = LoadLibrary(_T("user32.dll"));
-	if (hUserDll) {
-		MySetLayeredWindowAttributes = (BOOL (WINAPI *)(HWND,COLORREF,BYTE,DWORD))GetProcAddress(hUserDll, "SetLayeredWindowAttributes");
-		MyUpdateLayeredWindow = (BOOL (WINAPI *)(HWND, HDC, POINT *, SIZE *, HDC, POINT *, COLORREF, BLENDFUNCTION *, DWORD))GetProcAddress(hUserDll, "UpdateLayeredWindow");
-		MyAnimateWindow = (BOOL (WINAPI*)(HWND,DWORD,DWORD))GetProcAddress(hUserDll,"AnimateWindow");
-		MyDrawTextW = (int (WINAPI *)(HDC, LPCWSTR, int, LPRECT, UINT))GetProcAddress(hUserDll,"DrawTextW");
-		MyDrawTextExW = (int (WINAPI*)(HDC,LPCWSTR,int,LPRECT,UINT,LPDRAWTEXTPARAMS))GetProcAddress(hUserDll,"DrawTextExW");
-		MySetWindowTextW = (BOOL (WINAPI*)(HWND, LPCWSTR))GetProcAddress(hUserDll,"SetWindowTextW");
-		MySendMessageW = (LRESULT (WINAPI *)(HWND, UINT, WPARAM, LPARAM))GetProcAddress(hUserDll,"SendMessageW");
-		MyCallWindowProcW = (LRESULT (WINAPI  *)(WNDPROC, HWND, UINT, WPARAM, LPARAM))GetProcAddress(hUserDll,"CallWindowProcW");
-		MyCreateWindowExW = (HWND (WINAPI*)(DWORD, LPCWSTR, LPCWSTR, DWORD, int, int, int, int, HWND, HMENU, HINSTANCE, LPVOID))GetProcAddress(hUserDll,"CreateWindowExW");
-
-		if (LOWORD(GetVersion())!=4) { //Windows 98, ME, 2000, XP, and later support multimonitor configuration.
-			if (bResult) {
-				if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT)
-				{ //2000 or XP
-					#ifdef UNICODE
-						MyGetMonitorInfo = (BOOL (WINAPI*)(HMONITOR,LPMONITORINFO))GetProcAddress(hUserDll,("GetMonitorInfoW"));
-					#else
-						MyGetMonitorInfo = (BOOL (WINAPI*)(HMONITOR,LPMONITORINFO))GetProcAddress(hUserDll,("GetMonitorInfoA"));
-					#endif //UNICODE
-				} else
-				{ //98 or ME
-					// attempt to fix multimonitor on 9x
-					MyGetMonitorInfo = (BOOL (WINAPI*)(HMONITOR,LPMONITORINFO))GetProcAddress(hUserDll,("GetMonitorInfoA"));
-					if (!MyGetMonitorInfo)
-						MyGetMonitorInfo = (BOOL (WINAPI*)(HMONITOR,LPMONITORINFO))GetProcAddress(hUserDll,("GetMonitorInfo"));
-				}
-			} //There's no need for an else branch.
-			if (MyGetMonitorInfo)
-				MyMonitorFromWindow = (HMONITOR (WINAPI*)(HWND,DWORD))GetProcAddress(hUserDll, ("MonitorFromWindow"));
-		}
-	}
-
-	hGdiDll = LoadLibrary(_T("gdi32.dll"));
-	if (hGdiDll) {
-		MyGetTextExtentPoint32W = (BOOL (WINAPI *)(HDC, LPCWSTR, int, LPSIZE))GetProcAddress(hGdiDll,"GetTextExtentPoint32W");
-	}
-	else{
-		MyGetTextExtentPoint32W = 0;
-	}
-	hMsimgDll = LoadLibrary(_T("msimg32.dll"));
-	MyAlphaBlend = 0;
-	MyTransparentBlt = 0;
-	if (hMsimgDll)
-	{
-		MyTransparentBlt = (BOOL (WINAPI *)(HDC, int, int, int, int, HDC, int, int, int, int, UINT))
-			GetProcAddress(hMsimgDll, "TransparentBlt");
-		MyAlphaBlend = (BOOL (WINAPI *)(HDC, int, int, int, int, HDC, int, int, int, int, BLENDFUNCTION))
-			GetProcAddress(hMsimgDll, "AlphaBlend");
-	}
-#endif
 
 	hDwmapiDll = LoadLibrary(_T("dwmapi.dll"));
 	MyDwmEnableBlurBehindWindow = 0;
-- 
cgit v1.2.3