From fe83051082d1509bd653b718f119f884646d20e5 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Fri, 26 Jan 2018 18:59:51 +0300
Subject: MS_IMG_LOAD replaced with Bitmap_Load where possible

---
 plugins/TabSRMM/src/themes.cpp | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

(limited to 'plugins/TabSRMM/src/themes.cpp')

diff --git a/plugins/TabSRMM/src/themes.cpp b/plugins/TabSRMM/src/themes.cpp
index 81df273536..1b58c8715d 100644
--- a/plugins/TabSRMM/src/themes.cpp
+++ b/plugins/TabSRMM/src/themes.cpp
@@ -752,7 +752,7 @@ static struct
 
 void CImageItem::Create(const wchar_t *szImageFile)
 {
-	HBITMAP hbm = LoadPNG(szImageFile);
+	HBITMAP hbm = Bitmap_Load(szImageFile);
 	BITMAP bm;
 
 	m_hdc = nullptr;
@@ -996,16 +996,6 @@ void CImageItem::Colorize(HBITMAP hBitmap, BYTE dr, BYTE dg, BYTE db, BYTE alpha
 	}
 }
 
-/////////////////////////////////////////////////////////////////////////////////////////
-// load PNG image using core service(advaimg)
-
-HBITMAP TSAPI CImageItem::LoadPNG(const wchar_t *szFilename)
-{
-	HBITMAP hBitmap = nullptr;
-	hBitmap = (HBITMAP)CallService(MS_IMG_LOAD, (WPARAM)szFilename, IMGL_WCHAR);
-	return hBitmap;
-}
-
 /////////////////////////////////////////////////////////////////////////////////////////
 // set filename and load parameters from the database
 // called on:
@@ -1675,7 +1665,7 @@ void CSkin::setupAeroSkins()
 		mir_snwprintf(tszFilename, L"%scustom_unknown.png", tszBasePath);
 		if (!PathFileExists(tszFilename))
 			mir_snwprintf(tszFilename, L"%sunknown.png", tszBasePath);
-		PluginConfig.g_hbmUnknown = (HBITMAP)CallService(MS_IMG_LOAD, (WPARAM)tszFilename, IMGL_WCHAR);
+		PluginConfig.g_hbmUnknown = Bitmap_Load(tszFilename);
 		if (PluginConfig.g_hbmUnknown == nullptr) {
 			HDC dc = GetDC(nullptr);
 			PluginConfig.g_hbmUnknown = CreateCompatibleBitmap(dc, 20, 20);
@@ -1807,7 +1797,7 @@ void CSkin::setupAeroSkins()
 	if (!PathFileExists(tszFilename))
 		mir_snwprintf(tszFilename, L"%stabskin_aero_button.png", tszBasePath);
 
-	hbm = (HBITMAP)CallService(MS_IMG_LOAD, (WPARAM)tszFilename, IMGL_WCHAR);
+	hbm = Bitmap_Load(tszFilename);
 
 	CImageItem::Colorize(hbm, GetRValue(m_dwmColorRGB),
 		GetGValue(m_dwmColorRGB),
-- 
cgit v1.2.3