From 612fc2f36903f0168f88622f61e1a0de4dae5b92 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 1 Jun 2015 22:15:26 +0000
Subject: - atavism named MS_UTILS_LOADBITMAP removed; - bmpfilter.cpp also
 removed; - Bitmap_Load() function added instead; - various bitmap related
 crap fixed;

git-svn-id: http://svn.miranda-ng.org/main/trunk@13966 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp | 10 +++-------
 plugins/Clist_nicer/src/clcopts.cpp               |  2 +-
 plugins/Clist_nicer/src/extBackg.cpp              |  2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'plugins/Clist_nicer/src')

diff --git a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
index 6ce2df5ff9..d9a2614206 100644
--- a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
+++ b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
@@ -2332,10 +2332,7 @@ boolean AlignCOLLIconToLeft; //will hide frame icon
 
 int OnFrameTitleBarBackgroundChange()
 {
-	DBVARIANT dbv;
-
 	AlignCOLLIconToLeft = cfg::getByte("FrameTitleBar", "AlignCOLLIconToLeft", 0);
-
 	bkColour = cfg::getDword("FrameTitleBar", "BkColour", CLCDEFAULT_BKCOLOUR);
 
 	if (hBmpBackground) {
@@ -2343,10 +2340,9 @@ int OnFrameTitleBarBackgroundChange()
 		hBmpBackground = NULL;
 	}
 	if (cfg::getByte("FrameTitleBar", "UseBitmap", CLCDEFAULT_USEBITMAP)) {
-		if (!db_get(NULL, "FrameTitleBar", "BkBitmap", &dbv)) {
-			hBmpBackground = (HBITMAP)CallService(MS_UTILS_LOADBITMAP, 0, (LPARAM)dbv.pszVal);
-			mir_free(dbv.pszVal);
-		}
+		ptrT tszBitmapName(db_get_tsa(NULL, "FrameTitleBar", "BkBitmap"));
+		if (tszBitmapName != NULL)
+			hBmpBackground = Bitmap_Load(tszBitmapName);
 	}
 	backgroundBmpUse = cfg::getWord("FrameTitleBar", "BkBmpUse", CLCDEFAULT_BKBMPUSE);
 
diff --git a/plugins/Clist_nicer/src/clcopts.cpp b/plugins/Clist_nicer/src/clcopts.cpp
index 23a6b172d4..ccff06c1b1 100644
--- a/plugins/Clist_nicer/src/clcopts.cpp
+++ b/plugins/Clist_nicer/src/clcopts.cpp
@@ -745,7 +745,7 @@ static INT_PTR CALLBACK DlgProcClcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam,
 		if (LOWORD(wParam) == IDC_BROWSE) {
 			TCHAR str[MAX_PATH], filter[512];
 			GetDlgItemText(hwndDlg, IDC_FILENAME, str, SIZEOF(str));
-			BmpFilterGetStrings(filter, SIZEOF(filter));
+			Bitmap_GetFilter(filter, SIZEOF(filter));
 
 			OPENFILENAME ofn = { 0 };
 			ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400;
diff --git a/plugins/Clist_nicer/src/extBackg.cpp b/plugins/Clist_nicer/src/extBackg.cpp
index 4e441c8c98..3b3d478c1c 100644
--- a/plugins/Clist_nicer/src/extBackg.cpp
+++ b/plugins/Clist_nicer/src/extBackg.cpp
@@ -625,7 +625,7 @@ static void CorrectBitmap32Alpha(HBITMAP hBitmap)
 
 static HBITMAP LoadPNG(const char *szFilename)
 {
-	HBITMAP hBitmap = (HBITMAP)CallService(MS_UTILS_LOADBITMAP, 0, (LPARAM)szFilename);
+	HBITMAP hBitmap = Bitmap_Load(_A2T(szFilename));
 	if (hBitmap != 0)
 		CorrectBitmap32Alpha(hBitmap);
 
-- 
cgit v1.2.3