5 files changed, 4 insertions, 36 deletions
diff --git a/protocols/AimOscar/src/aim.cpp b/protocols/AimOscar/src/aim.cpp
index 27f991e5a9..81df8ff453 100644
--- a/protocols/AimOscar/src/aim.cpp
+++ b/protocols/AimOscar/src/aim.cpp
@@ -112,7 +112,6 @@ extern "C" int __declspec(dllexport) Load(void)
 	pd.fnUninit = protoUninit;
 	CallService(MS_PROTO_REGISTERMODULE, 0, (LPARAM) & pd);
 
-	InitThemeSupport();
 	InitIcons();
 
 	return 0;
diff --git a/protocols/AimOscar/src/aim.h b/protocols/AimOscar/src/aim.h
index c05129e385..ddf2d6d60c 100644
--- a/protocols/AimOscar/src/aim.h
+++ b/protocols/AimOscar/src/aim.h
@@ -27,6 +27,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #include <sys/stat.h>
 #include <time.h>
 #include <malloc.h>
+#include <Uxtheme.h>
 
 //Miranda NG includes
 #include <msapi\vssym32.h>
diff --git a/protocols/AimOscar/src/theme.cpp b/protocols/AimOscar/src/theme.cpp
index 14a97d7f81..0a553f1d55 100644
--- a/protocols/AimOscar/src/theme.cpp
+++ b/protocols/AimOscar/src/theme.cpp
@@ -175,29 +175,6 @@ void InitExtraIcons(void)
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////
-// Themes
-
-#define MGPROC(x) GetProcAddress(themeAPIHandle,x)
-
-HMODULE  themeAPIHandle = NULL; // handle to uxtheme.dll
-HANDLE   (WINAPI *MyOpenThemeData)(HWND,LPCWSTR) = 0;
-HRESULT  (WINAPI *MyCloseThemeData)(HANDLE) = 0;
-HRESULT  (WINAPI *MyDrawThemeBackground)(HANDLE,HDC,int,int,const RECT *,const RECT *) = 0;
-
-void InitThemeSupport(void)
-{
-	if (!IsWinVerXPPlus()) return;
-
-	themeAPIHandle = GetModuleHandleA("uxtheme");
-	if (themeAPIHandle)
-	{
-		MyOpenThemeData = (HANDLE (WINAPI *)(HWND,LPCWSTR))MGPROC("OpenThemeData");
-		MyCloseThemeData = (HRESULT (WINAPI *)(HANDLE))MGPROC("CloseThemeData");
-		MyDrawThemeBackground = (HRESULT (WINAPI *)(HANDLE,HDC,int,int,const RECT *,const RECT *))MGPROC("DrawThemeBackground");
-	}
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////
 // OnPreBuildContactMenu
 
 int CAimProto::OnPreBuildContactMenu(WPARAM wParam,LPARAM /*lParam*/)
diff --git a/protocols/AimOscar/src/theme.h b/protocols/AimOscar/src/theme.h
index 09566479ad..8c520ceb75 100644
--- a/protocols/AimOscar/src/theme.h
+++ b/protocols/AimOscar/src/theme.h
@@ -19,12 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef THEME_H
 #define THEME_H
 
-extern HMODULE themeAPIHandle;
-extern HANDLE  (WINAPI *MyOpenThemeData)(HWND,LPCWSTR);
-extern HRESULT (WINAPI *MyCloseThemeData)(HANDLE);
-extern HRESULT (WINAPI *MyDrawThemeBackground)(HANDLE,HDC,int,int,const RECT *,const RECT *);
-
-void InitThemeSupport(void);
 void InitIcons(void);
 void InitExtraIcons(void);
 
diff --git a/protocols/AimOscar/src/ui.cpp b/protocols/AimOscar/src/ui.cpp
index 9c165eb7b5..9e5a82cab0 100644
--- a/protocols/AimOscar/src/ui.cpp
+++ b/protocols/AimOscar/src/ui.cpp
@@ -47,7 +47,7 @@ void DrawMyControl(HDC hDC, HWND /*hwndButton*/, HANDLE hTheme, UINT iState, REC
 		}
 		rect.top-=1;
 		rect.left-=1;
-		MyDrawThemeBackground(hTheme, hDC, BP_PUSHBUTTON,state, &rect, NULL);
+		DrawThemeBackground(hTheme, hDC, BP_PUSHBUTTON,state, &rect, NULL);
 	}
 	else
 	{
@@ -219,11 +219,8 @@ static INT_PTR CALLBACK userinfo_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, L
 
 	case WM_DRAWITEM:
 		{
-			if (themeAPIHandle)
-			{
-				MyCloseThemeData (hThemeButton);
-				hThemeButton = MyOpenThemeData (GetDlgItem(hwndDlg, IDC_BOLD), L"Button");
-			}
+			CloseThemeData(hThemeButton);
+			hThemeButton = OpenThemeData(GetDlgItem(hwndDlg, IDC_BOLD), L"Button");
 			LPDRAWITEMSTRUCT lpDIS = (LPDRAWITEMSTRUCT) lParam;
 			if (lpDIS->CtlID == IDC_SUPERSCRIPT)
 			{