From 612fc2f36903f0168f88622f61e1a0de4dae5b92 Mon Sep 17 00:00:00 2001 From: George Hazan 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/ModernOpt/src/mopt_selector.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'plugins/ModernOpt/src') diff --git a/plugins/ModernOpt/src/mopt_selector.cpp b/plugins/ModernOpt/src/mopt_selector.cpp index df9fdc565b..994ba7489a 100644 --- a/plugins/ModernOpt/src/mopt_selector.cpp +++ b/plugins/ModernOpt/src/mopt_selector.cpp @@ -46,15 +46,9 @@ static void sttPreviewSkin(MODERNOPTOBJECT *obj, TCHAR *fn, LPDRAWITEMSTRUCT lps return; } - char *afn = mir_t2a(fn); - char *fnpreview = (char *)mir_alloc(mir_strlen(afn) + 10); - mir_strcpy(fnpreview, afn); - mir_strcat(fnpreview, ".png"); - HBITMAP hbmPreview = (HBITMAP)CallService(MS_UTILS_LOADBITMAP, 0, (LPARAM)fnpreview); - mir_free(afn); - mir_free(fnpreview); - - if (!hbmPreview) return; + HBITMAP hbmPreview = Bitmap_Load(CMString(fn) + _T(".png")); + if (!hbmPreview) + return; BITMAP bmp; GetObject(hbmPreview, sizeof(bmp), &bmp); -- cgit v1.2.3