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/FloatingContacts | |
| 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/FloatingContacts')
| -rw-r--r-- | plugins/FloatingContacts/src/main.cpp | 10 | ||||
| -rw-r--r-- | plugins/FloatingContacts/src/options.cpp | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/plugins/FloatingContacts/src/main.cpp b/plugins/FloatingContacts/src/main.cpp index f0e6295ad7..03101b7fb8 100644 --- a/plugins/FloatingContacts/src/main.cpp +++ b/plugins/FloatingContacts/src/main.cpp @@ -564,7 +564,7 @@ static void CreateBackgroundBrush() hBkBrush = NULL;
}
- if ( db_get_b(NULL, MODULE, "DrawBorder", FLT_DEFAULT_DRAWBORDER)) {
+ if (db_get_b(NULL, MODULE, "DrawBorder", FLT_DEFAULT_DRAWBORDER)) {
COLORREF cr = (COLORREF)db_get_dw(NULL, MODULE, "LTEdgesColor", FLT_DEFAULT_LTEDGESCOLOR);
hLTEdgesPen = CreatePen(PS_SOLID, 1, cr);
cr = (COLORREF)db_get_dw(NULL, MODULE, "RBEdgesColor", FLT_DEFAULT_RBEDGESCOLOR);
@@ -572,11 +572,9 @@ static void CreateBackgroundBrush() }
if (db_get_b(NULL, MODULE, "BkUseBitmap", FLT_DEFAULT_BKGNDUSEBITMAP)) {
- DBVARIANT dbv;
- if ( !db_get_ts(NULL, MODULE, "BkBitmap", &dbv)) {
- hBmpBackground = (HBITMAP)CallService(MS_UTILS_LOADBITMAPT, 0, (LPARAM)dbv.ptszVal);
- db_free(&dbv);
- }
+ ptrT tszBitmapName(db_get_tsa(NULL, MODULE, "BkBitmap"));
+ if (tszBitmapName != NULL)
+ hBmpBackground = Bitmap_Load(tszBitmapName);
}
nBackgroundBmpUse = (WORD)db_get_w(NULL, MODULE, "BkBitmapOpt", FLT_DEFAULT_BKGNDBITMAPOPT);
diff --git a/plugins/FloatingContacts/src/options.cpp b/plugins/FloatingContacts/src/options.cpp index 0571b83aa8..fbc0a79f65 100644 --- a/plugins/FloatingContacts/src/options.cpp +++ b/plugins/FloatingContacts/src/options.cpp @@ -246,7 +246,7 @@ static INT_PTR APIENTRY OptSknWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP {
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 = sizeof(ofn);
|