diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-06-01 22:15:26 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-06-01 22:15:26 +0000 |
| commit | 612fc2f36903f0168f88622f61e1a0de4dae5b92 (patch) | |
| tree | 7ba72966a7ed48a480b01e4b964d85fecdcbb725 /plugins/Clist_modern/src/modern_toolbar.cpp | |
| parent | acd4daf132c8ff3b05df7615e95f60be2fb82ddb (diff) | |
- 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
Diffstat (limited to 'plugins/Clist_modern/src/modern_toolbar.cpp')
| -rw-r--r-- | plugins/Clist_modern/src/modern_toolbar.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/plugins/Clist_modern/src/modern_toolbar.cpp b/plugins/Clist_modern/src/modern_toolbar.cpp index cee0d5137a..3771fc2324 100644 --- a/plugins/Clist_modern/src/modern_toolbar.cpp +++ b/plugins/Clist_modern/src/modern_toolbar.cpp @@ -138,14 +138,13 @@ static int ehhToolBarBackgroundSettingsChanged(WPARAM, LPARAM) DeleteObject(tbdat.mtb_hBmpBackground);
tbdat.mtb_hBmpBackground = NULL;
}
+
if (g_CluiData.fDisableSkinEngine) {
- DBVARIANT dbv;
tbdat.mtb_bkColour = sttGetColor("ToolBar", "BkColour", CLCDEFAULT_BKCOLOUR);
if (db_get_b(NULL, "ToolBar", "UseBitmap", CLCDEFAULT_USEBITMAP)) {
- if (!db_get_s(NULL, "ToolBar", "BkBitmap", &dbv, DBVT_TCHAR)) {
- tbdat.mtb_hBmpBackground = (HBITMAP)CallService(MS_UTILS_LOADBITMAP, 0, (LPARAM)dbv.ptszVal);
- db_free(&dbv);
- }
+ ptrT tszBitmapName(db_get_tsa(NULL, "ToolBar", "BkBitmap"));
+ if (tszBitmapName)
+ tbdat.mtb_hBmpBackground = Bitmap_Load(tszBitmapName);
}
tbdat.mtb_useWinColors = db_get_b(NULL, "ToolBar", "UseWinColours", CLCDEFAULT_USEWINDOWSCOLOURS);
tbdat.mtb_backgroundBmpUse = db_get_b(NULL, "ToolBar", "BkBmpUse", CLCDEFAULT_BKBMPUSE);
|